diff --git a/app/helpers/forms_helper.rb b/app/helpers/forms_helper.rb
index be33d60..4025070 100644
--- a/app/helpers/forms_helper.rb
+++ b/app/helpers/forms_helper.rb
@@ -64,7 +64,7 @@ module FormsHelper
     content_tag('div', labelled_select(_('State:'), 'state', :id, :name, nil, states, :id => state_id), :class => 'select_state_for_origin' ) +
     content_tag('div', labelled_select(_('City:'), 'city', :id, :name, nil, cities, :id => city_id), :class => 'select_city_for_origin' ) +
 
-    observe_field(state_id, :update => city_id, :url => { :controller => 'search', :action => 'cities' }, :with => 'state_id')
+    observe_field(state_id, :update => city_id, :function => "new Ajax.Updater(#{city_id.inspect}, #{url_for(:controller => 'search', :action => 'cities').inspect}, {asynchronous:true, evalScripts:true, parameters:'state_id=' + value}); $(#{city_id.inspect}).innerHTML = '<option>#{_('Loading...')}</option>'", :with => 'state_id')
   end
 
 protected
diff --git a/app/views/search/_search_form.rhtml b/app/views/search/_search_form.rhtml
index fe8f11c..59843f7 100644
--- a/app/views/search/_search_form.rhtml
+++ b/app/views/search/_search_form.rhtml
@@ -25,16 +25,11 @@
       <br style='clear:left'/>
       <div>
         <span class="formfield">
-          <label for="search-radius"><%= _('Distance (km):') %></label>
-          <%= text_field_tag 'radius', '', :id => 'search-radius', :size => 3 %>
+          <%= select_city %>
         </span>
-        &nbsp;
         <span class="formfield">
-          <label for="search_region"><%= _('From:') %></label>
-          <%= text_field :region, :name, :id => 'search_region', :size => 30 %>
+          <%= labelled_select(_('Distance:'), 'radius', :first, :last, nil, [15, 30, 50, 100, 150, 200, 300, 400, 500, 1000].map{|n|[n, n.to_s + 'km']}) %>
         </span>
-        <div id='search_region_auto_complete' class='auto-complete'></div>
-        <%= auto_complete_field('search_region', :url => {:action => 'complete_region'}) %>
       </div>
     </div><!-- fim class="search-options" -->
 
diff --git a/app/views/search/_sellers_form.rhtml b/app/views/search/_sellers_form.rhtml
index 5f81181..77bb69d 100644
--- a/app/views/search/_sellers_form.rhtml
+++ b/app/views/search/_sellers_form.rhtml
@@ -14,7 +14,7 @@
   </div>
   
   <div class="formfield search-distance-opt">
-    <%= labelled_text_field _('Distance (km): '), 'radius' %>
+    <%= labelled_select(_('Distance:'), 'radius', :first, :last, nil, [15, 30, 50, 100, 150, 200, 300, 400, 500, 1000].map{|n|[n, n.to_s + 'km']}) %>
   </div>
 
   <div class="button-bar">
--
libgit2 0.21.2