diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index 5d71b21dc..07c4ccf39 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -58,7 +58,7 @@ class CropsController < ApplicationController
 
     respond_to do |format|
       format.html
-      format.json { render :json => Crop.autosuggest(params[:term]) }
+      format.json { render :json => Crop.search(params[:term]) }
     end
   end
 
diff --git a/app/models/crop.rb b/app/models/crop.rb
index 7c0461e39..c8678c458 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -40,8 +40,8 @@ class Crop < ActiveRecord::Base
       tokenizer: {
         gs_edgeNGram_tokenizer: {
           type: "edgeNGram",
-          min_gram: 2,
-          max_gram: 20,
+          min_gram: 4,
+          max_gram: 10,
           token_chars: [ "letter", "digit" ]
         }
       },