diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 077350ab..474bfac1 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -5,7 +5,13 @@ class MapsController < ApplicationController
   def index
     respond_to do |format|
       format.html
-      format.json { render json: Event.moderated.future.geo }
+      format.json do
+        @events = Event.moderated.future.geo
+        @events = @events.region params[:region] if params[:region]
+        @events = @events.locality params[:locality] if params[:locality]
+        @events = @events.tag params[:tag] if params[:tag]
+        render json: @events
+      end
     end
   end
 end