diff --git a/app/views/avoid_postings/_search.html.erb b/app/views/avoid_postings/_search.html.erb
index 20a261996..520e9a465 100644
--- a/app/views/avoid_postings/_search.html.erb
+++ b/app/views/avoid_postings/_search.html.erb
@@ -1,16 +1,18 @@
 <%= form_search(path: avoid_postings_path, always_display: true) do |f| %>
-  <%= f.user :creator %>
-  <% if CurrentUser.is_admin? %>
-    <%= f.input :ip_addr, label: "Creator IP Address" %>
-  <% end %>
-  <%= f.input :any_name_matches, label: "Name", hint: "Use * for wildcard", autocomplete: "artist" %>
-  <%= f.input :artist_name, label: "Artist Name", hide_unless_value: true %>
-  <%= f.input :artist_id, label: "Artist ID", hide_unless_value: true %>
+  <%= f.input :any_name_matches, label: "Artist", hint: "Use * for wildcard", autocomplete: "artist" %>
   <%= f.input :any_other_name_matches, label: "Other Names", hide_unless_value: true %>
   <%= f.input :group_name, label: "Group Name", hide_unless_value: true %>
+  <%= f.input :artist_name, label: "Artist Name", hide_unless_value: true %>
+  <%= f.input :artist_id, label: "Artist ID", hide_unless_value: true %>
+
+  <% if CurrentUser.is_admin? %>
+    <%= f.user :creator %>
+    <%= f.input :ip_addr, label: "Creator IP" %>
+    <br />
+  <% end %>
   <%= f.input :details, label: "Details" %>
   <% if CurrentUser.is_staff? %>
-    <%= f.input :staff_notes %>
+    <%= f.input :staff_notes, label: "Staff Notes" %>
   <% end %>
   <%= f.input :is_active, label: "Active?", collection: [%w[Yes true], %w[No false], %w[Any any]] %>
   <%= f.input :order, collection: [["Artist Name", "artist_name"], %w[Created created_at], %w[Updated updated_at]], include_blank: true %>
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 60e1a1c71..4f33a9a5e 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -4,7 +4,7 @@
     <h2>Before uploading, read
       the <%= link_to "how to upload guide", wiki_page_path(id: "howto:upload") %>.</h2>
     <p>Make sure you're not posting something on
-      the <%= link_to "Avoid Posting List", avoid_postings_path %><br>
+      the <%= link_to "Avoid Posting List", avoid_posting_static_path %><br>
       Review the <%= link_to "Uploading Guidelines", help_page_path(id: "uploading_guidelines") %>
       <br>
       Unsure what to tag your post