diff --git a/app/assets/javascripts/dmails.js b/app/assets/javascripts/dmails.js
deleted file mode 100644
index 0f07a7b9b..000000000
--- a/app/assets/javascripts/dmails.js
+++ /dev/null
@@ -1,10 +0,0 @@
-(function() {
-  Danbooru.Dmail = {};
-  
-  Danbooru.Dmail.initialize_all = function() {
-  }
-})();
-
-$(document).ready(function() {
-  Danbooru.Dmail.initialize_all();
-});
diff --git a/app/assets/javascripts/forum_posts.js b/app/assets/javascripts/forum_posts.js
deleted file mode 100644
index b5e3f811d..000000000
--- a/app/assets/javascripts/forum_posts.js
+++ /dev/null
@@ -1,3 +0,0 @@
-(function() {
-  Danbooru.ForumPost = {};
-})();
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 845ce1abe..3bbc96c29 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -392,7 +392,7 @@ Danbooru.Note = {
     start: function() {
       $("#original-file-link").click();
       $("#image").one("click", Danbooru.Note.TranslationMode.create_note);
-      Danbooru.notice("Click on the image to create a note (shortcut is ctrl+a)");
+      Danbooru.notice("Click on the image to create a note (shortcut is n)");
     },
     
     stop: function() {
@@ -474,8 +474,7 @@ Danbooru.Note = {
 $(function() {
   if ($("#c-posts #a-show").size() > 0) {
     $("#translate").one("click", Danbooru.Note.TranslationMode.start);
-    // $("#note-container").width($("#image").width()).height($("#image").height());
-    $(document).bind("keydown", "ctrl+a", Danbooru.Note.TranslationMode.start);
+    $(document).bind("keydown", "n", Danbooru.Note.TranslationMode.start);
     Danbooru.Note.load_all();
     $("#image").click(Danbooru.Note.Box.toggle_all);
   }
diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
deleted file mode 100644
index 11de93e60..000000000
--- a/app/assets/javascripts/users.js
+++ /dev/null
@@ -1,2 +0,0 @@
-$(function() {
-});
diff --git a/app/assets/javascripts/wiki_pages.js b/app/assets/javascripts/wiki_pages.js
deleted file mode 100644
index 0519ecba6..000000000
--- a/app/assets/javascripts/wiki_pages.js
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/jquery_ui_custom.css.scss b/app/assets/stylesheets/common/jquery_ui_custom.css.scss
index 91f259f78..e4f2bfb28 100644
--- a/app/assets/stylesheets/common/jquery_ui_custom.css.scss
+++ b/app/assets/stylesheets/common/jquery_ui_custom.css.scss
@@ -4,3 +4,8 @@ div.ui-dialog {
     margin-bottom: 1em;
   }
 }
+
+.ui-state-highlight {
+  border: 2px solid #999;
+  background: #eee;
+}
\ No newline at end of file
diff --git a/app/models/post.rb b/app/models/post.rb
index af9bc3364..2e636c9d6 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -710,6 +710,10 @@ class Post < ActiveRecord::Base
         relation = relation.where("posts.approver_id = ?", q[:approver_id])
       end
       
+      if q[:parent_id]
+        relation = relation.where("(posts.id = ? or posts.parent_id = ?)", q[:parent_id], q[:parent_id])
+      end
+      
       if q[:rating] == "q"
         relation = relation.where("posts.rating = 'q'")
       elsif q[:rating] == "s"
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 10cb89bd9..2fc15d67a 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -213,7 +213,7 @@ class Tag < ActiveRecord::Base
       }
 
       scan_query(query).each do |token|
-        if token =~ /\A(-uploader|uploader|-approver|approver|-pool|pool|-fav|fav|sub|md5|-rating|rating|width|height|mpixels|score|filesize|source|id|date|order|status|tagcount|gentags|arttags|chartags|copytags):(.+)\Z/
+        if token =~ /\A(-uploader|uploader|-approver|approver|-pool|pool|-fav|fav|sub|md5|-rating|rating|width|height|mpixels|score|filesize|source|id|date|order|status|tagcount|gentags|arttags|chartags|copytags|parent):(.+)\Z/
           case $1
           when "-uploader"
             q[:uploader_id_neg] ||= []
@@ -293,6 +293,9 @@ class Tag < ActiveRecord::Base
           when "copytags"
             q[:copyright_tag_count] = parse_helper($2)
             
+          when "parent"
+            q[:parent_id] = $2.to_i
+            
           when "order"
             q[:order] = $2