diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76e5ee2..db1e07c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [v1.1.1-SNAPSHOT]
 
 - Added 'Jurisdictional Distribution' and 'Fishing Effort' #27796
+- Removed thousands separator from Reference years #27886
+- Added 'Map Preview' support #27843
+- Forced 'searchable' to 'True' to solve statistic issue #27922
 
 
 ## [v1.1.0]
diff --git a/src/main/resources/freemarker/Fishery.ftl b/src/main/resources/freemarker/Fishery.ftl
index 4333d31..bde820b 100644
--- a/src/main/resources/freemarker/Fishery.ftl
+++ b/src/main/resources/freemarker/Fishery.ftl
@@ -14,6 +14,7 @@
 	</#if>
 	"version" : "${version?string["0.0"]}",
 	"private": ${include_sensitive?c},
+	"searchable": "True", <#-- If the Record is private we have to set searchable to True see https://support.d4science.org/issues/27922 -->
 	"extras": [
 		<#-- START of Common Metadata -->
 		<@metadata key="GRSF Type" namespace=identity_namespace var=grsf_type?capitalize />
@@ -50,7 +51,8 @@
 		</#if>
 
 		<@metadata key="Status of the Record" var=status_grsf_record />
-		<@metadata key="spatial" var=spatial />
+		<@metadata key="spatial" var=spatial /> <#-- deprecated see https://support.d4science.org/issues/27843 -->
+		<@metadata key="Map Preview" var=map_preview /> <#-- see https://support.d4science.org/issues/27843 -->
 		<#-- END of Stock/Fishery Common Metadata -->
 
 		<#-- START of Fishery Metadata -->
diff --git a/src/main/resources/freemarker/Stock.ftl b/src/main/resources/freemarker/Stock.ftl
index 6de887b..8adf9d4 100644
--- a/src/main/resources/freemarker/Stock.ftl
+++ b/src/main/resources/freemarker/Stock.ftl
@@ -14,6 +14,7 @@
 	</#if>
 	"version" : "${version?string["0.0"]}",
 	"private": ${include_sensitive?c},
+	"searchable": "True", <#-- If the Record is private we have to set searchable to True see https://support.d4science.org/issues/27922 -->
 	"extras": [
 		<#-- START of Common Metadata -->
 		<@metadata key="GRSF Type" namespace=identity_namespace var=grsf_type?capitalize />
@@ -50,7 +51,8 @@
 		</#if>
 
 		<@metadata key="Status of the Record" var=status_grsf_record />
-		<@metadata key="spatial" var=spatial />
+		<@metadata key="spatial" var=spatial /> <#-- deprecated see https://support.d4science.org/issues/27843 -->
+		<@metadata key="Map Preview" var=map_preview /> <#-- see https://support.d4science.org/issues/27843 -->
 		<#-- END of Stock/Fishery Common Metadata -->
 
 		<#-- START of Stock Metadata -->
diff --git a/src/main/resources/freemarker/Traceability Unit.ftl b/src/main/resources/freemarker/Traceability Unit.ftl
index 365475c..055b6ea 100644
--- a/src/main/resources/freemarker/Traceability Unit.ftl	
+++ b/src/main/resources/freemarker/Traceability Unit.ftl	
@@ -14,6 +14,7 @@
 	</#if>
 	"version" : "${version?string["0.0"]}",
 	"private": ${include_sensitive?c},
+	"searchable": "True", <#-- If the Record is private we have to set searchable to True see https://support.d4science.org/issues/27922 -->
 	"extras": [
 		<#-- START of Common Metadata -->
 		<@metadata key="GRSF Type" namespace=identity_namespace var="Traceability Unit" />
@@ -44,6 +45,7 @@
 		<@metadatalist key="Flag State" namespace=identity_namespace list=flag_state tagValues=true />
 		<@metadatalist key="Fishing Gear" namespace=identity_namespace list=fishing_gear tagValues=true />
 		<@metadatalist key="Management Body/Authority" namespace=identity_namespace list=management_body_authorities />
+		<@metadata key="Map Preview" var=map_preview /> <#-- see https://support.d4science.org/issues/27843 -->
 		<#-- END of Traceability Unit Metadata -->
 		
 		<@metadata key="system:type" var="Traceability Unit" sep="" />
diff --git a/src/main/resources/freemarker/macros.ftl b/src/main/resources/freemarker/macros.ftl
index a995e58..b1bba1a 100644
--- a/src/main/resources/freemarker/macros.ftl
+++ b/src/main/resources/freemarker/macros.ftl
@@ -94,7 +94,7 @@
 			<#list list[0..*5] as ts>
 				{
 					"key": "<#if namespace?has_content>${namespace}:</#if>${key}",
-					"value": "${ts.value?json_string} [<#if ts.unit?has_content>Unit: ${ts.unit?json_string}<#assign valueSep = " - " ></#if><#if ts.reporting_year_or_assessment_id?has_content>${valueSep}Rep. Year or Assessment ID: ${ts.reporting_year_or_assessment_id?json_string}<#assign valueSep = " - " ></#if><#if ts.reference_year?has_content>${valueSep}Ref. Year: ${ts.reference_year?json_string}<#assign valueSep = " - " ></#if><#if ts.data_owner?has_content>${valueSep}Data Owner: ${ts.data_owner?json_string}<#assign valueSep = " - " ></#if><#if ts.db_source?has_content>${valueSep}DB Source: ${ts.db_source?json_string}</#if>]"
+					"value": "${ts.value?json_string} [<#if ts.unit?has_content>Unit: ${ts.unit?json_string}<#assign valueSep = " - " ></#if><#if ts.reporting_year_or_assessment_id?has_content>${valueSep}Rep. Year or Assessment ID: ${ts.reporting_year_or_assessment_id?json_string}<#assign valueSep = " - " ></#if><#if ts.reference_year?has_content>${valueSep}Ref. Year: ${ts.reference_year?replace(',','')}<#assign valueSep = " - " ></#if><#if ts.data_owner?has_content>${valueSep}Data Owner: ${ts.data_owner?json_string}<#assign valueSep = " - " ></#if><#if ts.db_source?has_content>${valueSep}DB Source: ${ts.db_source?json_string}</#if>]"
 				}${sep}
 			</#list>
 		</#if>