diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb
index 20f47da02..707b40654 100644
--- a/app/controllers/admin/domains_controller.rb
+++ b/app/controllers/admin/domains_controller.rb
@@ -17,18 +17,10 @@ module Admin
                 end
 
       normalize_search_parameters do
-        @q = domains.ransack(params[:q])
+        @q = domains.ransack(PartialSearchFormatter.format(params[:q]))
         @domains = @q.result.page(params[:page])
-        (redirect_to [:admin, @domains.first] and return if @domains.count == 1 && params[:q][:name_matches].present?)
-        if @domains.count.zero? && params[:q][:name_matches] !~ /^%.+%$/
-          # if we do not get any results, add wildcards to the name field and search again
-          n_cache = params[:q][:name_matches]
-          params[:q][:name_matches] = "%#{params[:q][:name_matches]}%"
-          @q = domains.ransack(params[:q])
-          @domains = @q.result.page(params[:page])
-          params[:q][:name_matches] = n_cache # we don't want to show wildcards in search form
-        end
       end
+
       @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
 
       render_by_format('admin/domains/index', 'domains')
@@ -95,7 +87,7 @@ module Admin
     def build_associations
       @server_statuses = @domain.statuses.select { |x| DomainStatus::SERVER_STATUSES.include?(x) }
       @server_statuses = [nil] if @server_statuses.empty?
-      @other_statuses = @domain.statuses.select { |x| !DomainStatus::SERVER_STATUSES.include?(x) }
+      @other_statuses = @domain.statuses.reject { |x| DomainStatus::SERVER_STATUSES.include?(x) }
     end
 
     def ignore_empty_statuses
diff --git a/app/views/admin/domains/_search_form.html.erb b/app/views/admin/domains/_search_form.html.erb
index ecfdd1ced..a59abeec5 100644
--- a/app/views/admin/domains/_search_form.html.erb
+++ b/app/views/admin/domains/_search_form.html.erb
@@ -9,19 +9,19 @@
   <div class="col-md-2">
     <div class="form-group">
       <%= f.label :registrant_ident, for: nil %>
-      <%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %>
+      <%= f.search_field :registrant_ident_matches, value: params[:q][:registrant_ident_matches], class: 'form-control', placeholder: t(:registrant_ident) %>
     </div>
   </div>
   <div class="col-md-3">
     <div class="form-group">
       <%= f.label :contact_ident, for: nil %>
-      <%= f.search_field :contacts_ident_eq, class: 'form-control', placeholder: t(:contact_ident) %>
+      <%= f.search_field :contacts_ident_matches, value: params[:q][:contacts_ident_matches], class: 'form-control', placeholder: t(:contact_ident) %>
     </div>
   </div>
   <div class="col-md-4">
     <div class="form-group">
       <%= f.label :nameserver_hostname, for: nil %>
-      <%= f.search_field :nameservers_hostname_eq, class: 'form-control', placeholder: t(:nameserver_hostname) %>
+      <%= f.search_field :nameservers_hostname_matches, value: params[:q][:nameservers_hostname_matches], class: 'form-control', placeholder: t(:nameserver_hostname) %>
     </div>
   </div>
 </div>