diff --git a/app/views/dtext_links/index.html.erb b/app/views/dtext_links/index.html.erb
index 8cc2957fd..8ec40e974 100644
--- a/app/views/dtext_links/index.html.erb
+++ b/app/views/dtext_links/index.html.erb
@@ -4,8 +4,8 @@
       <%= f.input :link_target_ilike, label: "Link", hint: "Use * for wildcard", input_html: { value: params[:search][:link_target_ilike], data: { autocomplete: "wiki-page" } } %>
       <%= f.input :model_type, label: "Page Type", collection: [["Wiki Page", "WikiPage"], ["Forum Post", "ForumPost"]], include_blank: true, selected: params[:search][:model_type] %>
       <%= f.input :link_type, label: "Link Type", collection: [["Wiki", "0"], ["External", "1"]], include_blank: true, selected: params[:search][:link_type] %>
-      <%= f.input :linked_wiki_exists, label: "Wiki Exists?", collection: ["Yes", "No"], include_blank: true, selected: params[:search][:linked_wiki_exists] %>
-      <%= f.input :linked_tag_exists, label: "Tag Exists?", collection: ["Yes", "No"], include_blank: true, selected: params[:search][:linked_tag_exists] %>
+      <%= f.input :has_linked_wiki, label: "Wiki Exists?", collection: ["Yes", "No"], include_blank: true, selected: params[:search][:has_linked_wiki] %>
+      <%= f.input :has_linked_tag, label: "Tag Exists?", collection: ["Yes", "No"], include_blank: true, selected: params[:search][:has_linked_tag] %>
       <%= f.submit "Search" %>
     <% end %>
 
diff --git a/app/views/forum_posts/search.html.erb b/app/views/forum_posts/search.html.erb
index decceebfe..f889cd3a3 100644
--- a/app/views/forum_posts/search.html.erb
+++ b/app/views/forum_posts/search.html.erb
@@ -3,11 +3,15 @@
     <h1>Search Forum</h1>
 
     <%= search_form_for(forum_posts_path) do |f| %>
-      <%= f.input :topic_title_matches, label: "Title" %>
+      <%= f.simple_fields_for :topic do |pf| %>
+        <%= pf.input :title_matches, label: "Title" %>
+      <% end %>
       <%= f.input :body_matches, label: "Body" %>
       <%= f.input :creator_name, label: "Creator", input_html: { "data-autocomplete": "user" } %>
       <%= f.input :linked_to, label: "Tag", hint: "Find posts mentioning a tag", input_html: { "data-autocomplete": "tag" } %>
-      <%= f.input :topic_category_id, label: "Category", collection: ForumTopic::CATEGORIES.invert.to_a, include_blank: true %>
+      <%= f.simple_fields_for :topic do |pf| %>
+        <%= pf.input :category_id, label: "Category", collection: ForumTopic::CATEGORIES.invert.to_a, include_blank: true %>
+      <% end %>
       <%= f.submit "Search" %>
     <% end %>
   </div>
diff --git a/app/views/tags/_search.html.erb b/app/views/tags/_search.html.erb
index a4fb623b6..a6a2bfbe1 100644
--- a/app/views/tags/_search.html.erb
+++ b/app/views/tags/_search.html.erb
@@ -3,7 +3,7 @@
   <%= f.input :category, label: "Category", collection: TagCategory.canonical_mapping.to_a, include_blank: true,selected: params[:search][:category] %>
   <%= f.input :order, collection: [%w[Newest date], %w[Count count], %w[Name name]], include_blank: false, selected: params[:search][:order] %>
   <%= f.input :hide_empty, label: "Hide empty?", collection: %w[yes no], selected: params[:search][:hide_empty] %>
-  <%= f.input :has_wiki, label: "Has wiki?", collection: %w[yes no], include_blank: true, selected: params[:search][:has_wiki] %>
+  <%= f.input :has_wiki_page, label: "Has wiki?", collection: %w[yes no], include_blank: true, selected: params[:search][:has_wiki_page] %>
   <%= f.input :has_artist, label: "Has artist?", collection: %w[yes no], include_blank: true, selected: params[:search][:has_artist] %>
   <%= f.submit "Search" %>
 <% end %>