diff --git a/pywb/rules.yaml b/pywb/rules.yaml
index 2266cb0d..a5be4dea 100644
--- a/pywb/rules.yaml
+++ b/pywb/rules.yaml
@@ -59,7 +59,8 @@ rules:
     #=================================================================
     - url_prefix: 'com,facebook)/ajax/pagelet/generic.php/'
 
-      fuzzy_lookup: 'com,facebook\)/.*[?&]data=(.*?(?:[&]|query_type[^,]+))'
+      #fuzzy_lookup: 'com,facebook\)/.*[?&]data=(.*?(?:[&]|query_type[^,]+))'
+      fuzzy_lookup: 'com,facebook\)/.*[?&]data=(.*?(?:[&]|(?:query_type|fbid)[^,]+))'
 
     - url_prefix: 'com,facebook)/ajax/ufi/'
 
diff --git a/pywb/static/wombat.js b/pywb/static/wombat.js
index 988a07cc..19ab534c 100644
--- a/pywb/static/wombat.js
+++ b/pywb/static/wombat.js
@@ -2138,6 +2138,9 @@ var _WBWombat = function($wbwindow, wbinfo) {
 
     //============================================
     function override_func_this_proxy_to_obj(cls, method) {
+        if (!cls || !cls.prototype) {
+            return;
+        }
         var prototype = cls.prototype;
         var orig = prototype[method];
 
@@ -2150,6 +2153,9 @@ var _WBWombat = function($wbwindow, wbinfo) {
 
     //============================================
     function override_func_first_arg_proxy_to_obj(cls, method) {
+        if (!cls || !cls.prototype) {
+            return;
+        }
         var prototype = cls.prototype;
         var orig = prototype[method];
 
@@ -2415,7 +2421,9 @@ var _WBWombat = function($wbwindow, wbinfo) {
 
         // domain
         var domain_setter = function(val) {
-            if (ends_with(this._WB_wombat_location.hostname, val)) {
+            var loc = this._WB_wombat_location || this.defaultView._WB_wombat_location;
+
+            if (loc && ends_with(loc.hostname, val)) {
                 this.__wb_domain = val;
             }
         }