diff --git a/src/main/java/org/genesys2/server/service/impl/FilterHandler.java b/src/main/java/org/genesys2/server/service/impl/FilterHandler.java
index 7514f48c6477006569cc3d4feb0642f01214a3d9..944f82379f33d86600dae4c8e05a711a67898604 100644
--- a/src/main/java/org/genesys2/server/service/impl/FilterHandler.java
+++ b/src/main/java/org/genesys2/server/service/impl/FilterHandler.java
@@ -87,6 +87,7 @@ public class FilterHandler {
 		this.availableFilters.add(new AutocompleteFilter(FilterConstants.TAXONOMY_SCINAME, "/explore/ac/taxonomy"));
 
 		this.availableFilters.add(new AutocompleteFilter(FilterConstants.ORGCTY_ISO3, "/explore/ac/country"));
+		this.availableFilters.add(new AutocompleteFilter(FilterConstants.INSTITUTE_COUNTRY_ISO3, "/explore/ac/country"));
 		this.availableFilters.add(new BasicFilter(FilterConstants.GEO_LATITUDE, DataType.NUMERIC));
 		this.availableFilters.add(new BasicFilter(FilterConstants.GEO_LONGITUDE, DataType.NUMERIC));
 		this.availableFilters.add(new BasicFilter(FilterConstants.GEO_ELEVATION, DataType.NUMERIC));
diff --git a/src/main/webapp/html/js/crophub.js b/src/main/webapp/html/js/crophub.js
index 166f6d2a79b68b7d5719f537fb41bb6e26b80fd0..eb94f204a222fd7a79fe41341e9e69cc465a409f 100644
--- a/src/main/webapp/html/js/crophub.js
+++ b/src/main/webapp/html/js/crophub.js
@@ -191,7 +191,7 @@ GenesysChart = {
 
 GenesysFilter = {
 	normKey: function(key) {
-		return key.replace('.','-').replace(':','_');
+		return key.replace(/\./g,'-').replace(/:/g,'_');
 	},
     //add filter with autocomplete or exact field
     filterAutocomplete: function (element, jsonData) {