diff --git a/CHANGES.rst b/CHANGES.rst
index 38728846..7dd7562a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+pywb 0.4.6 changelist
+~~~~~~~~~~~~~~~~~~~~~
+
+* Improved top -> WB_wombat_top rewriting.
+
 pywb 0.4.5 changelist
 ~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/README.rst b/README.rst
index 69930293..8e719972 100644
--- a/README.rst
+++ b/README.rst
@@ -1,11 +1,11 @@
-PyWb 0.4.5
+PyWb 0.4.6
 ==========
 
-.. image:: https://travis-ci.org/ikreymer/pywb.png?branch=master
+.. image:: https://travis-ci.org/ikreymer/pywb.png?branch=develop
       :target: https://travis-ci.org/ikreymer/pywb
          
-.. image:: https://coveralls.io/repos/ikreymer/pywb/badge.png?branch=master
-      :target: https://coveralls.io/r/ikreymer/pywb?branch=master
+.. image:: https://coveralls.io/repos/ikreymer/pywb/badge.png?branch=develop
+      :target: https://coveralls.io/r/ikreymer/pywb?branch=develop
 
 pywb is a python implementation of web archival replay tools, sometimes also known as 'Wayback Machine'.
 
diff --git a/pywb/rewrite/regex_rewriters.py b/pywb/rewrite/regex_rewriters.py
index aba9462a..b0011d61 100644
--- a/pywb/rewrite/regex_rewriters.py
+++ b/pywb/rewrite/regex_rewriters.py
@@ -109,7 +109,6 @@ class JSLinkOnlyRewriter(RegexRewriter):
 
     def __init__(self, rewriter, rules=[]):
         rules = rules + [
-            #(self.JS_HTTPX, rewriter.get_abs_url(), 0)
             (self.JS_HTTPX, RegexRewriter.archival_rewrite(rewriter), 0)
         ]
         super(JSLinkOnlyRewriter, self).__init__(rules)
@@ -129,11 +128,14 @@ class JSLinkAndLocationRewriter(JSLinkOnlyRewriter):
              (r'(?<=document\.)referrer', RegexRewriter.add_prefix(prefix), 0),
 
             #todo: move to mixin?
+             (r'(?:[\s=()]|^)(top)(?:[\s!=()]|$)',
+              RegexRewriter.add_prefix(prefix), 1),
+
              (r'(?<=window\.)top',
               RegexRewriter.add_prefix(prefix), 0),
 
-             (r'\b(top)\b[!=\W]+(?:self|window)',
-              RegexRewriter.add_prefix(prefix), 1),
+#             (r'\b(top)\b[!=\W]+(?:self|window)',
+#              RegexRewriter.add_prefix(prefix), 1),
 
              #(r'\b(?:self|window)\b[!=\W]+\b(top)\b',
              #RegexRewriter.add_prefix(prefix), 1),
diff --git a/setup.py b/setup.py
index 644ec1a4..e08fac5d 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ class PyTest(TestCommand):
 
 setup(
     name='pywb',
-    version='0.4.5',
+    version='0.4.6',
     url='https://github.com/ikreymer/pywb',
     author='Ilya Kreymer',
     author_email='ikreymer@gmail.com',