diff --git a/app/models/category.rb b/app/models/category.rb
index 087e9de..ee73f35 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -15,6 +15,8 @@ class Category < ActiveRecord::Base
 
   acts_as_filesystem
 
+  acts_as_searchable :additional_fields => [{:name => {:boost => 2.0}}]
+
   has_many :article_categorizations
   has_many :articles, :through => :article_categorizations
   has_many :comments, :through => :articles
diff --git a/lib/set_profile_region_from_city_state.rb b/lib/set_profile_region_from_city_state.rb
index 3874568..cf24d3f 100644
--- a/lib/set_profile_region_from_city_state.rb
+++ b/lib/set_profile_region_from_city_state.rb
@@ -24,9 +24,9 @@ module SetProfileRegionFromCityState
 
     def region_from_city_and_state
       if @change_region
-        s = State.find_by_name self.state
+        s = State.find_by_contents(self.state)[:results].first
         if s
-          c = s.children.find_by_name self.city
+          c = City.find_by_contents(self.city, {}, :filter_queries => ["parent_id:#{s.id}"])[:results].first
           self.region = c
         end
       end
--
libgit2 0.21.2