diff --git a/safesite/templates/riskas.html b/safesite/templates/riskas.html
index 763fe778..38893243 100644
--- a/safesite/templates/riskas.html
+++ b/safesite/templates/riskas.html
@@ -51,10 +51,10 @@
     // }
     function fxsearch() {
         var querydata = $('#fxfxf').serializeJSON();
-        bindmap_fxdlxt('fxdlxt');
-    bindmap_fxdjbt('fxdjbt');
-    bindmap_fxjbt('fxjbt');
-    bindmap_fxdqyt('fxdqyt');
+        bindmap_fxdlxt('fxdlxt',querydata);
+    bindmap_fxdjbt('fxdjbt',querydata);
+    bindmap_fxjbt('fxjbt',querydata);
+    bindmap_fxdqyt('fxdqyt',querydata);
     }
     var now = new Date();
     var year = now.getFullYear();
diff --git a/safesite/views.py b/safesite/views.py
index 220685a4..b72b1b10 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -1991,7 +1991,8 @@ def apiriskas(req):
         objs2 = Risk.objects.filter(usecomp__partid=companyid)
         if req.GET.get('zrbm',None):
             partid = req.GET.get('zrbm')
-            objs = objs.filter(riskact__zrbm__partid=partid)
+            objs = objs.filter(zrbm__partid=partid)
+            objs2 = objs2.filter(riskact__zrbm__partid=partid)
         xAxisData = []
         series = []
         #areas = Area.objects.filter(usecomp__partid=companyid,deletemark=1)