diff --git a/app/models/alternate_name.rb b/app/models/alternate_name.rb
index cb6f79e9d..857adf7ec 100644
--- a/app/models/alternate_name.rb
+++ b/app/models/alternate_name.rb
@@ -1,5 +1,5 @@
 class AlternateName < ActiveRecord::Base
-  after_commit { |an| an.crop.__elasticsearch__.index_document if an.crop }
+  after_commit { |an| an.crop.__elasticsearch__.index_document if an.crop && ENV['GROWSTUFF_ELASTICSEARCH'] == "true" }
   belongs_to :crop
   belongs_to :creator, :class_name => 'Member'
 end
diff --git a/app/models/crop.rb b/app/models/crop.rb
index 1f514f3ce..0571feecd 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -307,6 +307,7 @@ class Crop < ActiveRecord::Base
           query: {
             multi_match: {
               query: "#{search_str}",
+              analyzer: "standard",
               fields: ["name", "scientific_names.scientific_name", "alternate_names.name"]
             }
           },
diff --git a/app/models/scientific_name.rb b/app/models/scientific_name.rb
index 7469b3946..aec8f1091 100644
--- a/app/models/scientific_name.rb
+++ b/app/models/scientific_name.rb
@@ -1,5 +1,5 @@
 class ScientificName < ActiveRecord::Base
-  after_commit { |sn| sn.crop.__elasticsearch__.index_document if sn.crop }
+  after_commit { |sn| sn.crop.__elasticsearch__.index_document if sn.crop && ENV['GROWSTUFF_ELASTICSEARCH'] == "true" }
   belongs_to :crop
   belongs_to :creator, :class_name => 'Member'
 end