diff --git a/app/finders/crm/contacts_finder.rb b/app/finders/crm/contacts_finder.rb
index 841dcbcb6e19dce9ad06cb884c08429dd558bd18..f4f6f90f1d21ece897c2dc9d409569940ebc2dd1 100644
--- a/app/finders/crm/contacts_finder.rb
+++ b/app/finders/crm/contacts_finder.rb
@@ -25,7 +25,7 @@ def execute
       contacts = root_group.contacts
       contacts = by_state(contacts)
       contacts = by_search(contacts)
-      contacts.sort_by_name()
+      contacts.sort_by_name
     end
 
     private
diff --git a/app/finders/crm/organizations_finder.rb b/app/finders/crm/organizations_finder.rb
index b83585235d41f2f16c3f412a994fb6dd73a77f32..86f3409aff11abb64121ab0c576b9a1049e06c12 100644
--- a/app/finders/crm/organizations_finder.rb
+++ b/app/finders/crm/organizations_finder.rb
@@ -25,7 +25,7 @@ def execute
       organizations = root_group.organizations
       organizations = by_search(organizations)
       organizations = by_state(organizations)
-      organizations.sort_by_name()
+      organizations.sort_by_name
     end
 
     private
@@ -42,7 +42,6 @@ def root_group
 
     def by_search(organizations)
       return organizations unless search?
-      return organizations.none if params[:search].blank?
 
       organizations.search(params[:search])
     end
@@ -50,7 +49,7 @@ def by_search(organizations)
     def by_state(organizations)
       return organizations unless state?
 
-      organizations.where(state: params[:state])
+      organizations.search_by_state(params[:state])
     end
 
     def search?
diff --git a/app/models/customer_relations/contact.rb b/app/models/customer_relations/contact.rb
index 5e6b625dbbbe04bab357f54699eb7bb5f27a8ea0..261081f5ae1203b716fe8bf18e0148a4972813e5 100644
--- a/app/models/customer_relations/contact.rb
+++ b/app/models/customer_relations/contact.rb
@@ -56,7 +56,7 @@ def self.search_by_state(state)
     where(state: state)
   end
 
-  def self.sort_by_name()
+  def self.sort_by_name
     order("first_name ASC, last_name ASC")
   end
 
diff --git a/app/models/customer_relations/organization.rb b/app/models/customer_relations/organization.rb
index 7f73e41f28896335f9f7ab2be9efe529ba30637a..89be0187a00c719882812006372afec7e5a957d4 100644
--- a/app/models/customer_relations/organization.rb
+++ b/app/models/customer_relations/organization.rb
@@ -34,7 +34,11 @@ def self.search(query)
     fuzzy_search(query, [:name], use_minimum_char_limit: false)
   end
 
-  def self.sort_by_name()
+  def self.search_by_state(state)
+    where(state: state)
+  end
+
+  def self.sort_by_name
     order(name: :asc)
   end