diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
index 0e98c439b..0240875ec 100644
--- a/app/controllers/admin/domain_versions_controller.rb
+++ b/app/controllers/admin/domain_versions_controller.rb
@@ -16,9 +16,9 @@ module Admin
         search_params.delete(:registrant)
       end
 
-      if search_params[:whodunnit].present?
-        registrars = Registrar.where("name ilike ?", "%#{search_params[:whodunnit].strip}%")
-        search_params.delete(:whodunnit)
+      if search_params[:registrar].present?
+        registrars = Registrar.where("name ilike ?", "%#{search_params[:registrar].strip}%")
+        search_params.delete(:registrar)
       end
 
       whereS = "1=1"
@@ -45,7 +45,6 @@ module Admin
       @versions = @q.result.page(params[:page])
       @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
       render "admin/domain_versions/archive"
-
     end
 
     def show
diff --git a/app/views/admin/domain_versions/archive.haml b/app/views/admin/domain_versions/archive.haml
index 0058d3d97..1fd4dad87 100644
--- a/app/views/admin/domain_versions/archive.haml
+++ b/app/views/admin/domain_versions/archive.haml
@@ -15,7 +15,7 @@
         .col-md-3
           .form-group
             = label_tag t(:registrar_name)
-            = f.select :whodunnit, Registrar.all.map { |x| [x, x.name] }, { include_blank: true }, class: 'form-control', placeholder: t('.registrant')
+            = select_tag '[q][registrar]', options_for_select(Registrar.all.map { |x| [x, x.name] }, selected: params[:q][:registrar]), { include_blank: true, class: 'form-control', placeholder: t('.registrant')}
         .col-md-3
           .form-group
             = label_tag :action
diff --git a/test/system/admin_area/domain_versions_test.rb b/test/system/admin_area/domain_versions_test.rb
index 833398c61..65f081fe4 100644
--- a/test/system/admin_area/domain_versions_test.rb
+++ b/test/system/admin_area/domain_versions_test.rb
@@ -72,7 +72,7 @@ class DomainVersionsTest < ApplicationSystemTestCase
 
   def test_search_registrar_param
     visit admin_domain_versions_path
-    find('#q_registrar').set(@domain.registrar)
+    find('#_q_registrar').find(:option, @domain.registrar).select_option
     find('.btn.btn-primary').click
 
     assert_equal current_url,