diff --git a/client/site/js/FeatureInfoDisplay.js b/client/site/js/FeatureInfoDisplay.js
index 246235f2..5ef3c895 100755
--- a/client/site/js/FeatureInfoDisplay.js
+++ b/client/site/js/FeatureInfoDisplay.js
@@ -362,6 +362,12 @@ function onBeforeGetFeatureInfoClick(evt) {
 
     evt.object.layers[0].setVisibility(thematicLayer.getVisibility());
 
+    var queryLayers = selectedQueryableLayers.join(',');
+    if (identificationMode == 'activeLayers' && selectedQueryableLayers.indexOf(Eqwc.currentSelectedLayerId) > -1) {
+        queryLayers = Eqwc.currentSelectedLayerId;
+    }
+    WMSGetFInfo.vendorParams['QUERY_LAYERS'] = queryLayers;
+
     activateGetFeatureInfo(false);
 }