diff --git a/pywb/rewrite/regex_rewriters.py b/pywb/rewrite/regex_rewriters.py
index d2395ee3..da9ee355 100644
--- a/pywb/rewrite/regex_rewriters.py
+++ b/pywb/rewrite/regex_rewriters.py
@@ -142,26 +142,13 @@ class JSLocationRewriterMixin(object):
 
     def __init__(self, rewriter, rules=[], prefix='WB_wombat_'):
         rules = rules + [
-          #  (r'(?<![/$])\blocation\b(?!\":)', RegexRewriter.add_prefix(prefix), 0),
           (r'(?<![$\'"])\b(?:location|top)\b(?![$\'":])', RegexRewriter.add_prefix(prefix), 0),
 
-          (r'(?<=\.)postMessage\b\(', RegexRewriter.add_prefix('__WB_pmw(window).'), 0),
+          (r'(?<=[?])\s*(?:\w+[.])?(location)\s*(?=[:])', RegexRewriter.add_prefix(prefix), 1),
+
+          (r'(?<=\.)postMessage\b\(', RegexRewriter.add_prefix('__WB_pmw(self.window).'), 0),
 
           (r'(?<=\.)frameElement\b', RegexRewriter.add_prefix(prefix), 0),
-          #  (r'(?<=document\.)domain', RegexRewriter.add_prefix(prefix), 0),
-          #  (r'(?<=document\.)referrer', RegexRewriter.add_prefix(prefix), 0),
-          #  (r'(?<=document\.)cookie', RegexRewriter.add_prefix(prefix), 0),
-
-            #todo: move to mixin?
-          #(r'(?<=[\s=(){])(top)\s*(?:[!}?)]|==|$)',
-          # (r'(?<=[\s=(){.])(top)\s*(?:[,!}?)]|==|$)',
-          #  RegexRewriter.add_prefix(prefix), 1),
-
-          # (r'^(top)\s*(?:[!})]|==|$)',
-          #  RegexRewriter.add_prefix(prefix), 1),
-
-          # (r'(?<=window\.)(top)',
-          #  RegexRewriter.add_prefix(prefix), 1),
         ]
         super(JSLocationRewriterMixin, self).__init__(rewriter, rules)
 
diff --git a/pywb/rewrite/test/test_regex_rewriters.py b/pywb/rewrite/test/test_regex_rewriters.py
index 5523fac2..d1997f20 100644
--- a/pywb/rewrite/test/test_regex_rewriters.py
+++ b/pywb/rewrite/test/test_regex_rewriters.py
@@ -58,6 +58,14 @@ r"""
 >>> _test_js('$location = cond ? a.location: location; location$')
 '$location = cond ? a.WB_wombat_location: WB_wombat_location; location$'
 
+>>> _test_js('location$ = cond?a.location:location;')
+'location$ = cond?a.WB_wombat_location:WB_wombat_location;'
+
+>>> _test_js('location$ = {location: "location", top: " location "}')
+'location$ = {location: "location", top: " WB_wombat_location "}'
+
+
+
 # not rewriting WB_wombat_domain
 #>>> _test_js('window.location = "http://example.com/abc.html" document.domain = "anotherdomain.com"')
 #'window.WB_wombat_location = "/web/20131010/http://example.com/abc.html" document.WB_wombat_domain = "anotherdomain.com"'