diff --git a/merge.py b/merge.py
index 3904daa..417d07c 100644
--- a/merge.py
+++ b/merge.py
@@ -6,7 +6,7 @@
 out = open(sys.argv[3], "w")
 
 for l in inf:
-    if (l.find("rfcdiff.js") != -1):
+    if (l.find('<script src="rfcdiff.js"></script>') != -1):
         out.write("   <script>\n")
         for l2 in js:
             out.write(l2)
diff --git a/rfcdiff.js b/rfcdiff.js
index 467c374..07aef1a 100644
--- a/rfcdiff.js
+++ b/rfcdiff.js
@@ -11,7 +11,7 @@ function format_chunk(index) {
 }
 
 function find_chunk(n){
-    return document.querySelector('a[name$="' + n + '"]');
+    return document.querySelector('tr[id$="' + n + '"]');
 }
 
 function change_chunk(offset) {
@@ -27,7 +27,7 @@ function change_chunk(offset) {
     if (old_chunk) {
         old_chunk.style.outline = "";
     }
-    old_chunk = new_chunk.parentNode.parentNode;
+    old_chunk = new_chunk;
     old_chunk.style.outline = "1px solid red";
     window.location.hash = "#" + new_str;
     window.scrollBy(0,-100);