diff --git a/app/controllers/editor_controller.rb b/app/controllers/editor_controller.rb
index ac38e47b72..b7833362bd 100644
--- a/app/controllers/editor_controller.rb
+++ b/app/controllers/editor_controller.rb
@@ -35,12 +35,12 @@ def rich
       @main_image = Image.find_by(id: params[:main_image]).path
     end
 
-    if params[:tags]&.include? "lat:" and params[:tags]&.include? "lon:"
+    if params[:tags]&.include?('lat:') && params[:tags]&.include?('lon:')
       tags = params[:tags].split(',')
       tags.each do |x|
-        x.include? "lat:" and (@lat = x.split(':')[1])
-        x.include? "lon:" and (@lon = x.split(':')[1])
-        x.include? "zoom:" and (@zoom = x.split(':')[1])
+        x.include? "lat:" && (@lat = x.split(':')[1])
+        x.include? "lon:" && (@lon = x.split(':')[1])
+        x.include? "zoom:" && (@zoom = x.split(':')[1])
       end
     end