diff --git a/src/components/manage/Blocks/DiscodataComponents/Text/View.jsx b/src/components/manage/Blocks/DiscodataComponents/Text/View.jsx
index dce283f..371ddff 100644
--- a/src/components/manage/Blocks/DiscodataComponents/Text/View.jsx
+++ b/src/components/manage/Blocks/DiscodataComponents/Text/View.jsx
@@ -13,9 +13,13 @@ function isColor(strColor) {
 }
 
 const components = {
-  h1: (text, color, tooltip = false, tooltipText = '') => (
+  bold: (bold, text) => {
+    if (bold) return <b>{text}</b>;
+    return text;
+  },
+  h1: (text, bold, color, tooltip = false, tooltipText = '') => (
     <h1 className="query-param-text" style={{ color: color }}>
-      {text}
+      {components.bold(bold, text)}
       {tooltip && tooltipText ? (
         <span data-tip={tooltip && tooltipText ? tooltipText : false}>
           <Icon name={infoSVG} size="20" color={color} />
@@ -25,19 +29,19 @@ const components = {
       )}
     </h1>
   ),
-  h2: (text, color) => (
+  h2: (text, bold, color) => (
     <h2 className="query-param-text" style={{ color: color }}>
-      {text}
+      {components.bold(bold, text)}
     </h2>
   ),
-  h3: (text, color) => (
+  h3: (text, bold, color) => (
     <h3 className="query-param-text" style={{ color: color }}>
-      {text}
+      {components.bold(bold, text)}
     </h3>
   ),
-  p: (text, color) => (
+  p: (text, bold, color) => (
     <p className="query-param-text" style={{ color: color }}>
-      {text}
+      {components.bold(bold, text)}
     </p>
   ),
   link: (text, internalLink, linkTarget, link, color) => {
@@ -71,6 +75,7 @@ const View = ({ content, ...props }) => {
     rightText = '',
     color = '#000',
     order = 'dq',
+    bold = false,
   } = data;
   const {
     isLink = false,
@@ -211,6 +216,7 @@ const View = ({ content, ...props }) => {
       {textMayRender && components[component]
         ? components[component](
             isLink ? renderLinks[triggerOn] : text,
+            bold,
             isColor(color) ? color : '#000',
             tooltip,
             tooltipText,
diff --git a/src/components/manage/Blocks/DiscodataComponents/schema.jsx b/src/components/manage/Blocks/DiscodataComponents/schema.jsx
index ff42b91..6916372 100644
--- a/src/components/manage/Blocks/DiscodataComponents/schema.jsx
+++ b/src/components/manage/Blocks/DiscodataComponents/schema.jsx
@@ -165,6 +165,7 @@ export const makeTextSchema = (props) => {
         'rightText',
         'color',
         'component',
+        'bold',
       ],
     },
     {
@@ -225,6 +226,10 @@ export const makeTextSchema = (props) => {
         ['p', 'Paragraph'],
       ],
     },
+    bold: {
+      title: 'Bold',
+      type: 'boolean',
+    },
     isLink: {
       title: 'Is link',
       type: 'boolean',
diff --git a/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx b/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx
index a30cb59..b145b70 100644
--- a/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx
@@ -196,12 +196,7 @@ const renderComponents = {
         .slice(0, maxElements);
     }
     const view = (
-      <ol
-        className={cx(
-          'link-list responsive grid grid-cl-4',
-          props.component?.className?.join(' '),
-        )}
-      >
+      <ol className={cx('link-list', props.component?.className?.join(' '))}>
         {items.map((value) => (
           <li key={_uniqueId('li-')}>
             <button
@@ -484,7 +479,7 @@ const renderComponents = {
   },
   eprtrBatDerogations: (props) => {
     const items = props.item[props.component.value] || [];
-    return (
+    return items.length ? (
       <div className="eprtrBatDerogations">
         <h2 className="mb-0-super mr-1">BAT Derogations</h2>
         <Table className="unstackable">
@@ -497,25 +492,24 @@ const renderComponents = {
           </Table.Header>
 
           <Table.Body>
-            {items.length &&
-              items.map((item) => (
-                <Table.Row key={item.id}>
-                  <Table.Cell>{item.BATAEL}</Table.Cell>
-                  <Table.Cell>
-                    {moment(item.derogationDurationStartDate).format(
-                      'DD MMM YYYY',
-                    )}
-                  </Table.Cell>
-                  <Table.Cell>
-                    {moment(item.derogationDurationEndDate).format(
-                      'DD MMM YYYY',
-                    )}
-                  </Table.Cell>
-                </Table.Row>
-              ))}
+            {items.map((item) => (
+              <Table.Row key={item.id}>
+                <Table.Cell>{item.BATAEL}</Table.Cell>
+                <Table.Cell>
+                  {moment(item.derogationDurationStartDate).format(
+                    'DD MMM YYYY',
+                  )}
+                </Table.Cell>
+                <Table.Cell>
+                  {moment(item.derogationDurationEndDate).format('DD MMM YYYY')}
+                </Table.Cell>
+              </Table.Row>
+            ))}
           </Table.Body>
         </Table>
       </div>
+    ) : (
+      ''
     );
   },
   eprtrBatConclusions: (props) => {
@@ -527,62 +521,64 @@ const renderComponents = {
           {/* <Icon name={infoSVG} size="30" color="#EC776A" /> */}
         </div>
         <div className="eprtrBatConclusions bat-container">
-          {Object.entries(batConclusions).map(([key, conclusion]) => (
-            <div key={key} className="bat-conclusion">
-              <div className="bat-title mb-2">
-                <h3>
-                  {key}
-                  {/* <Icon name={blankSVG} size="20" color="#EC776A" /> */}
-                </h3>
-              </div>
-              <div className="bat-details grid grid-cl-2 mb-2">
-                <div>
-                  <p className="bold">Status</p>
-                  {/* <p className="info">{conclusion[0].conclusionStatus}</p> */}
+          {Object.entries(batConclusions)
+            .filter((key) => key)
+            .map(([key, conclusion]) => (
+              <div key={key} className="bat-conclusion">
+                <div className="bat-title mb-2">
+                  <h3>
+                    {key}
+                    {/* <Icon name={blankSVG} size="20" color="#EC776A" /> */}
+                  </h3>
                 </div>
-                {/* <div>
-                <p className="bold">Status Modified</p>
-                <p className="info">{conclusion[0].Status}</p>
-              </div> */}
-              </div>
-              {props.show.aels && (
-                <div className="bat-aels mb-2">
-                  <p className="bat-aels-title">BAT AELs</p>
-                  {conclusion.map((ael, index) =>
-                    ael.BATAELName ? (
-                      <div
-                        className="bat-ael"
-                        key={`${index} - ${ael.BATAELName}`}
-                      >
-                        <div className="bat-title mb-2">
-                          <h3>
-                            {ael.BATAELName}
-                            {/* <Icon name={blankSVG} size="20" color="#EC776A" /> */}
-                          </h3>
-                        </div>
-                        <div className="bat-details grid grid-cl-1 mb-2">
-                          <div>
-                            <p className="bold">Status</p>
-                            <p className="info">{ael.BATAELStatus}</p>
-                          </div>
-                          <div>
-                            <p className="bold">Accepted date</p>
-                            <p className="info">{ael.BATAELAcceptedDate}</p>
+                <div className="bat-details grid grid-cl-2 mb-2">
+                  <div>
+                    <p className="bold">Status</p>
+                    <p className="info">{conclusion[0].conclusionStatus}</p>
+                  </div>
+                  {/* <div>
+                    <p className="bold">Status Modified</p>
+                    <p className="info">{conclusion[0].Status}</p>
+                  </div> */}
+                </div>
+                {props.show.aels && (
+                  <div className="bat-aels mb-2">
+                    <p className="bat-aels-title">BAT AELs</p>
+                    {conclusion.map((ael, index) =>
+                      ael.BATAELName ? (
+                        <div
+                          className="bat-ael"
+                          key={`${index} - ${ael.BATAELName}`}
+                        >
+                          <div className="bat-title mb-2">
+                            <h3>
+                              {ael.BATAELName}
+                              {/* <Icon name={blankSVG} size="20" color="#EC776A" /> */}
+                            </h3>
                           </div>
-                          <div>
-                            <p className="bold">Description</p>
-                            <p className="info">{ael.Description}</p>
+                          <div className="bat-details grid grid-cl-1 mb-2">
+                            <div>
+                              <p className="bold">Status</p>
+                              <p className="info">{ael.BATAELStatus}</p>
+                            </div>
+                            <div>
+                              <p className="bold">Accepted date</p>
+                              <p className="info">{ael.BATAELAcceptedDate}</p>
+                            </div>
+                            <div>
+                              <p className="bold">Description</p>
+                              <p className="info">{ael.Description}</p>
+                            </div>
                           </div>
                         </div>
-                      </div>
-                    ) : (
-                      <p>No information available</p>
-                    ),
-                  )}
-                </div>
-              )}
-            </div>
-          ))}
+                      ) : (
+                        <p>No information available</p>
+                      ),
+                    )}
+                  </div>
+                )}
+              </div>
+            ))}
           <div className="hr mb-1" />
           <div className="bat-action text-align-center">
             <button
diff --git a/src/components/manage/Blocks/DiscodataComponentsBlock/style.css b/src/components/manage/Blocks/DiscodataComponentsBlock/style.css
index b659acd..ce47300 100644
--- a/src/components/manage/Blocks/DiscodataComponentsBlock/style.css
+++ b/src/components/manage/Blocks/DiscodataComponentsBlock/style.css
@@ -409,6 +409,10 @@ a.small h1 {
   color: #EC776A;
   padding: 0;
   list-style: none;
+  display: flex;
+  flex-flow: row;
+  flex-wrap: wrap;
+  grid-gap: 20px;
 }
 
 .link-list li {
diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
index 8b39a71..04e9fdb 100644
--- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
@@ -78,6 +78,7 @@ let Map,
   EsriJSON,
   VectorSource,
   VectorSourceEvent,
+  bboxStrategy,
   XYZ,
   fromLonLat,
   toLonLat,
@@ -141,9 +142,11 @@ const OpenlayersMapView = (props) => {
   const [loader, setLoader] = useState(false);
   const [mapRendered, setMapRendered] = useState(false);
   const [firstFilteringUpdate, setFirstFilteringUpdate] = useState(false);
+  const firstFilteringDone = useRef(false);
   const ToggleSidebarControl = useRef(null);
   const ViewYourAreaControl = useRef(null);
   const siteTermRef = useRef(null);
+  const mounted = useRef(false);
   const history = useHistory();
   const draggable = !!props.data?.draggable?.value;
   const hasPopups = !!props.data?.hasPopups?.value;
@@ -172,15 +175,6 @@ const OpenlayersMapView = (props) => {
       ? props.discodata_query.search.siteTerm || null
       : props.discodata_query.search[queryParams?.siteName?.param] || null;
 
-  useEffect(() => {
-    siteTermRef.current = siteTerm;
-  }, [siteTerm]);
-
-  if (mapRendered && !firstFilteringUpdate) {
-    updateFilters();
-    setFirstFilteringUpdate(true);
-  }
-
   useEffect(() => {
     if (__CLIENT__ && document) {
       // MOuNT
@@ -191,6 +185,7 @@ const OpenlayersMapView = (props) => {
         EsriJSON = require('ol/format/EsriJSON').default;
         VectorSource = require('ol/source/Vector').default;
         VectorSourceEvent = require('ol/source/Vector').VectorSourceEvent;
+        bboxStrategy = require('ol/loadingstrategy').bbox;
         XYZ = require('ol/source/XYZ').default;
         fromLonLat = require('ol/proj').fromLonLat;
         toLonLat = require('ol/proj').toLonLat;
@@ -257,12 +252,17 @@ const OpenlayersMapView = (props) => {
       renderMap();
       setMapRendered(true);
     }
+    mounted.current = true;
     return () => {
-      // UNMOUNT
+      mounted.current = false;
     };
     /* eslint-disable-next-line */
   }, [])
 
+  useEffect(() => {
+    siteTermRef.current = siteTerm;
+  }, [siteTerm]);
+
   useEffect(() => {
     if (mapRendered) {
       updateFilters();
@@ -280,17 +280,25 @@ const OpenlayersMapView = (props) => {
   useEffect(() => {
     if (mapRendered) {
       if (['byLocationTerm', 'bySiteTerm'].includes(state.updateMapPosition)) {
-        onSourceChange(state.map.sitesSourceLayer.getSource());
+        onSourceChange();
       } else if (
         state.map.sitesSourceQuery.where !== state.map.oldSitesSourceQuery.where
       ) {
         state.map.sitesSourceLayer &&
           state.map.sitesSourceLayer.getSource().refresh();
       }
+      if (!firstFilteringDone.current) {
+        firstFilteringDone.current = true;
+      }
     }
     /* eslint-disable-next-line */
   }, [state.map.sitesSourceQuery?.where, state.updateMapPosition])
 
+  if (mapRendered && !firstFilteringUpdate) {
+    updateFilters();
+    setFirstFilteringUpdate(true);
+  }
+
   function updateFilters() {
     const sitesSourceQuery = { ...state.map.sitesSourceQuery };
     if (hasSidebar && filterSource === 'eprtr_filters') {
@@ -383,7 +391,6 @@ const OpenlayersMapView = (props) => {
     sitesSourceQuery.where = Object.entries(sitesSourceQuery.whereStatements)
       .map(([id, where]) => where.sql)
       .join(' AND ');
-
     if (
       sitesSourceQuery.where !== state.map.sitesSourceQuery.where ||
       locationTerm?.text ||
@@ -405,7 +412,6 @@ const OpenlayersMapView = (props) => {
           updateMapPosition = 'bySiteTerm';
         }
       }
-      console.log(sitesSourceQuery.where);
       if (
         sitesSourceQuery.where !== state.map.sitesSourceQuery.where ||
         updateMapPosition !== stateRef.current.updateMapPosition
@@ -421,6 +427,8 @@ const OpenlayersMapView = (props) => {
           siteTerm,
         });
       }
+    } else if (!firstFilteringDone.current) {
+      firstFilteringDone.current = true;
     }
   }
 
@@ -507,6 +515,10 @@ const OpenlayersMapView = (props) => {
                   callback: function () {},
                 },
               );
+            setTimeout(() => {
+              stateRef?.current?.map?.sitesSourceLayer &&
+                stateRef.current.map.sitesSourceLayer.getSource().refresh();
+            }, options.duration + 100);
           }
         })
         .catch((error) => {});
@@ -533,12 +545,16 @@ const OpenlayersMapView = (props) => {
               zoom: 15,
             });
           }
+          setTimeout(() => {
+            stateRef?.current?.map?.sitesSourceLayer &&
+              stateRef.current.map.sitesSourceLayer.getSource().refresh();
+          }, 1100);
         })
         .catch((error) => {});
     }
   }
 
-  function onSourceChange(source) {
+  function onSourceChange() {
     const options = {
       duration: 2000,
       maxZoom: 15,
@@ -698,10 +714,8 @@ const OpenlayersMapView = (props) => {
       let reqs = 0;
       sitesSource = new VectorSource({
         loader: function (extent, resolution, projection) {
-          var url =
-            'https://services.arcgis.com/LcQjj2sL7Txk9Lag/arcgis/rest/services/SiteMap_v2/FeatureServer/0/query/?f=json&' +
-            'returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=' +
-            encodeURIComponent(
+          if (mounted.current && firstFilteringDone.current) {
+            var url = `https://services.arcgis.com/LcQjj2sL7Txk9Lag/arcgis/rest/services/SiteMap_v2/FeatureServer/0/query/?f=json&returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=${encodeURIComponent(
               '{"xmin":' +
                 extent[0] +
                 ',"ymin":' +
@@ -711,68 +725,82 @@ const OpenlayersMapView = (props) => {
                 ',"ymax":' +
                 extent[3] +
                 ',"spatialReference":{"wkid":102100}}',
-            ) +
-            '&geometryType=esriGeometryEnvelope&inSR=102100&outFields=*' +
-            '&outSR=102100';
-          // setLoader(true);
-          reqs++;
-          jsonp(
-            url,
-            {
-              param:
-                (stateRef.current.map.sitesSourceQuery.where
-                  ? qs.stringify({
-                      where: stateRef.current.map.sitesSourceQuery.where,
-                    })
-                  : '') + '&callback',
-            },
-            (error, response) => {
-              reqs--;
-              if (error) {
-                // setLoader(false);
-                console.log(error.message);
-              } else {
-                var features = esrijsonFormat.readFeatures(response, {
-                  featureProjection: projection,
-                });
-                if (features.length > 0) {
-                  sitesSource.addFeatures(features);
+            )}&geometryType=esriGeometryEnvelope&inSR=102100&outFields=*&outSR=102100`;
+            reqs++;
+            jsonp(
+              url,
+              {
+                param:
+                  (stateRef.current.map.sitesSourceQuery.where
+                    ? qs.stringify({
+                        where: stateRef.current.map.sitesSourceQuery.where,
+                      })
+                    : '') + '&callback',
+              },
+              (error, response) => {
+                reqs--;
+                if (error) {
+                  // setLoader(false);
+                  console.log(error.message);
+                } else {
+                  var features = esrijsonFormat.readFeatures(response, {
+                    featureProjection: projection,
+                  });
+                  if (features.length > 0) {
+                    sitesSource.addFeatures(features);
+                  } else {
+                    // setLoader(false);
+                  }
                   sitesSource.dispatchEvent(
-                    new VectorSourceEvent('updateFilters', features),
+                    new VectorSourceEvent('updateFilters'),
                   );
-                } else {
-                  // setLoader(false);
                 }
-              }
-            },
-          );
+              },
+            );
+          }
         },
-        strategy: tile(
-          createXYZ({
+        strategy: function (extent, resolution) {
+          const tileGrid = createXYZ({
             tileSize: 512,
-          }),
-        ),
+            maxZoom: zoomSwitch,
+          });
+          var z = tileGrid.getZForResolution(resolution);
+          var tileRange = tileGrid.getTileRangeForExtentAndZ(extent, z);
+          /** @type {Array<import("./extent.js").Extent>} */
+          var extents = [];
+          /** @type {import("./tilecoord.js").TileCoord} */
+          var tileCoord = [z, 0, 0];
+          for (
+            tileCoord[1] = tileRange.minX;
+            tileCoord[1] <= tileRange.maxX;
+            ++tileCoord[1]
+          ) {
+            for (
+              tileCoord[2] = tileRange.minY;
+              tileCoord[2] <= tileRange.maxY;
+              ++tileCoord[2]
+            ) {
+              extents.push(tileGrid.getTileCoordExtent(tileCoord));
+            }
+          }
+          return extents;
+        },
       });
       //  Make regions source layer
       if (hasRegionsFeatures) {
         regionsSource = new VectorSource({
           loader: function (extent, resolution, projection) {
-            var url =
-              'https://services.arcgis.com/LcQjj2sL7Txk9Lag/ArcGIS/rest/services/ly_IED_SiteClusters_WM/FeatureServer/0/query/?f=json' +
-              '&returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=' +
-              encodeURIComponent(
-                '{"xmin":' +
-                  extent[0] +
-                  ',"ymin":' +
-                  extent[1] +
-                  ',"xmax":' +
-                  extent[2] +
-                  ',"ymax":' +
-                  extent[3] +
-                  ',"spatialReference":{"wkid":102100}}',
-              ) +
-              '&geometryType=esriGeometryEnvelope&inSR=102100&outFields=*' +
-              '&outSR=102100';
+            var url = `https://services.arcgis.com/LcQjj2sL7Txk9Lag/ArcGIS/rest/services/ly_IED_SiteClusters_WM/FeatureServer/0/query/?f=json&returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=${encodeURIComponent(
+              '{"xmin":' +
+                extent[0] +
+                ',"ymin":' +
+                extent[1] +
+                ',"xmax":' +
+                extent[2] +
+                ',"ymax":' +
+                extent[3] +
+                ',"spatialReference":{"wkid":102100}}',
+            )}&geometryType=esriGeometryEnvelope&inSR=102100&outFields=*&outSR=102100`;
             jsonp(url, null, (error, response) => {
               if (error) {
                 console.log(error.message);
@@ -797,47 +825,55 @@ const OpenlayersMapView = (props) => {
       //  Sites source layer
       sitesSourceLayer = new VectorLayer({
         source: sitesSource,
-        style: (feature, resolution) => {
-          const featureProperties = feature.getProperties();
-          if (
-            featureProperties.siteName === siteTermRef.current ||
-            (SVG_COLLECTION[featureProperties.eea_activities]?.() &&
-              stateRef.current.map.element.getView().getZoom() > 11)
-          ) {
-            return new Style({
-              image: new Icon({
-                src:
-                  featureProperties.siteName === siteTermRef.current
-                    ? `data:image/svg+xml;utf8,${encodeURIComponent(
-                        pinSVG('#50C878'),
-                      )}`
-                    : `data:image/svg+xml;utf8,${encodeURIComponent(
-                        SVG_COLLECTION[featureProperties.eea_activities](),
-                      )}`,
-                opacity: 1,
-                scale: 1,
-              }),
-              zIndex:
-                featureProperties.siteName === siteTermRef.current ? 1 : 0,
-            });
-          } else {
-            return new Style({
-              image: new CircleStyle({
-                radius: 3,
-                fill:
-                  featureProperties.siteName === siteTermRef.current
-                    ? new Fill({ color: '#50C878' })
-                    : new Fill({ color: '#000' }),
-                stroke:
-                  featureProperties.siteName === siteTermRef.current
-                    ? new Stroke({ color: '#6A6A6A', width: 1 })
-                    : new Stroke({ color: '#6A6A6A', width: 1 }),
-                zIndex:
-                  featureProperties.siteName === siteTermRef.current ? 1 : 0,
-              }),
-            });
-          }
-        },
+        style: new Style({
+          image: new CircleStyle({
+            radius: 3,
+            fill: new Fill({ color: '#000' }),
+            stroke: new Stroke({ color: '#6A6A6A', width: 1 }),
+            zIndex: 0,
+          }),
+        }),
+        // style: (feature, resolution) => {
+        //   const featureProperties = feature.getProperties();
+        //   if (
+        //     featureProperties.siteName === siteTermRef.current ||
+        //     (SVG_COLLECTION[featureProperties.eea_activities]?.() &&
+        //       stateRef.current.map.element?.getView?.()?.getZoom?.() > 11)
+        //   ) {
+        //     return new Style({
+        //       image: new Icon({
+        //         src:
+        //           featureProperties.siteName === siteTermRef.current
+        //             ? `data:image/svg+xml;utf8,${encodeURIComponent(
+        //                 pinSVG('#50C878'),
+        //               )}`
+        //             : `data:image/svg+xml;utf8,${encodeURIComponent(
+        //                 SVG_COLLECTION[featureProperties.eea_activities](),
+        //               )}`,
+        //         opacity: 1,
+        //         scale: 1,
+        //       }),
+        //       zIndex:
+        //         featureProperties.siteName === siteTermRef.current ? 1 : 0,
+        //     });
+        //   } else {
+        //     return new Style({
+        //       image: new CircleStyle({
+        //         radius: 3,
+        //         fill:
+        //           featureProperties.siteName === siteTermRef.current
+        //             ? new Fill({ color: '#50C878' })
+        //             : new Fill({ color: '#000' }),
+        //         stroke:
+        //           featureProperties.siteName === siteTermRef.current
+        //             ? new Stroke({ color: '#6A6A6A', width: 1 })
+        //             : new Stroke({ color: '#6A6A6A', width: 1 }),
+        //         zIndex:
+        //           featureProperties.siteName === siteTermRef.current ? 1 : 0,
+        //       }),
+        //     });
+        //   }
+        // },
         visible: true,
         title: 'ly_IED_SiteMap_WM',
       });
@@ -891,8 +927,7 @@ const OpenlayersMapView = (props) => {
       //  Events
       sitesSource.on('updateFilters', function (e) {
         if (!reqs && e.target.getState() === 'ready') {
-          // setLoader(false);
-          onSourceChange(e.target);
+          onSourceChange();
         }
       });
       if (hasPopups) {
@@ -911,33 +946,35 @@ const OpenlayersMapView = (props) => {
         });
       }
       map.on('moveend', function (e) {
-        if (hasSidebar && document.getElementById('dynamic-filter')) {
-          const closestFeature = stateRef.current.map.sitesSourceLayer
-            .getSource()
-            .getClosestFeatureToCoordinate(
-              stateRef.current.map.element.getView().getCenter(),
+        if (mounted.current) {
+          if (hasSidebar && document.getElementById('dynamic-filter')) {
+            const closestFeature = stateRef.current.map.sitesSourceLayer
+              ?.getSource?.()
+              ?.getClosestFeatureToCoordinate?.(
+                stateRef.current.map.element?.getView?.()?.getCenter?.(),
+              );
+            document.getElementById('dynamic-filter').dispatchEvent(
+              new CustomEvent('featurechange', {
+                detail: {
+                  feature: closestFeature,
+                },
+              }),
             );
-          document.getElementById('dynamic-filter').dispatchEvent(
-            new CustomEvent('featurechange', {
-              detail: {
-                feature: closestFeature,
-              },
-            }),
-          );
-        }
-        let newZoom = map.getView().getZoom();
-        if (currentZoom !== newZoom) {
-          if (newZoom > zoomSwitch) {
-            sitesSourceLayer.setVisible(true);
-            hasRegionsFeatures && regionsSourceLayer.setVisible(false);
-          } else if (newZoom > 2) {
-            sitesSourceLayer.setVisible(false);
-            hasRegionsFeatures && regionsSourceLayer.setVisible(true);
-          } else {
-            sitesSourceLayer.setVisible(false);
-            hasRegionsFeatures && regionsSourceLayer.setVisible(false);
           }
-          currentZoom = newZoom;
+          let newZoom = map.getView().getZoom();
+          if (currentZoom !== newZoom) {
+            if (newZoom > zoomSwitch) {
+              sitesSourceLayer.setVisible(true);
+              hasRegionsFeatures && regionsSourceLayer.setVisible(false);
+            } else if (newZoom > 2) {
+              sitesSourceLayer.setVisible(false);
+              hasRegionsFeatures && regionsSourceLayer.setVisible(true);
+            } else {
+              sitesSourceLayer.setVisible(false);
+              hasRegionsFeatures && regionsSourceLayer.setVisible(false);
+            }
+            currentZoom = newZoom;
+          }
         }
       });
       setState({
@@ -1045,9 +1082,7 @@ const OpenlayersMapView = (props) => {
                 {/* SITE CONTENTS */}
                 <div className="row mb-1-super mt-0-super">
                   <div className="column column-12">
-                    <Header Header as="h3">
-                      Site contents
-                    </Header>
+                    <Header as="h3">Site contents</Header>
                   </div>
                   <div className="column  column-12">
                     <p>
@@ -1078,12 +1113,10 @@ const OpenlayersMapView = (props) => {
                             : ''
                         }
                         onClick={setSiteQueryParams}
-                        to={
-                          '/industrial-site/introduction/understanding-the-data'
-                        }
+                        to={'/industrial-site/large-scale-fuel-combustion'}
                       >
                         {state.popupDetails.properties.nLCP || 0} Large
-                        comustion plants
+                        combustion plants
                       </Link>
                     </p>
                   </div>
diff --git a/src/components/manage/Blocks/FiltersBlock/View.jsx b/src/components/manage/Blocks/FiltersBlock/View.jsx
index 1702cda..ac1ca51 100644
--- a/src/components/manage/Blocks/FiltersBlock/View.jsx
+++ b/src/components/manage/Blocks/FiltersBlock/View.jsx
@@ -611,10 +611,20 @@ const View = ({ content, ...props }) => {
                   ],
                 };
               }
+              const queries =
+                props.discodata_query.search[metadata[index].queryToSet] || [];
+              const filteringInptsByQuery =
+                queries.length > 1
+                  ? queries.map((query, index) => ({
+                      id: _uniqueId('select_'),
+                      type: 'select',
+                      position: index,
+                    }))
+                  : [metadata[index]?.firstInput];
               filtersMeta[metadata[index]?.key] = {
                 filteringInputs: filteringInputs.length
                   ? filteringInputs
-                  : [metadata[index]?.firstInput],
+                  : filteringInptsByQuery,
                 placeholder: metadata[index]?.placeholder,
                 queryToSet: metadata[index]?.queryToSet,
                 title: metadata[index]?.title,
@@ -725,23 +735,58 @@ const View = ({ content, ...props }) => {
 
   const initialization = () => {
     let newFilters = {};
+    let newFiltersMeta = { ...state.filtersMeta };
+    const dynamicFiltersQuery = [
+      'region',
+      'riverBasin',
+      'townVillage',
+      'pollutant',
+    ];
     if (state.filters && state.filtersMeta) {
       newFilters = { ...state.filters };
-      const filtersMetaEntries = Object.entries(state.filtersMeta);
-      const filtersMetaKeys = filtersMetaEntries.map(([key, value]) => {
-        return value.queryToSet;
+      const filtersMetaKeys = Object.keys(state.filtersMeta);
+      const queryParamKeys = filtersMetaKeys.map((key) => {
+        return state.filtersMeta[key].queryToSet;
       });
-      filtersMetaKeys.forEach((key) => {
+      dynamicFiltersQuery.forEach((key) => {
+        if (queryParamKeys.indexOf(key) === -1) {
+          queryParamKeys.push(key);
+        }
+      });
+      queryParamKeys.forEach((key, keyIndex) => {
         if (props.discodata_query.search[key]) {
           newFilters[key] = props.discodata_query.search[key];
+          props.discodata_query.search[key].forEach((param, index) => {
+            if (
+              index > 0 &&
+              newFiltersMeta[filtersMetaKeys[keyIndex]]?.filteringInputs
+            ) {
+              newFiltersMeta[filtersMetaKeys[keyIndex]].filteringInputs.push({
+                id: _uniqueId('select_'),
+                type: 'select',
+                position: index,
+              });
+            }
+          });
         }
       });
     }
 
-    setState({
-      ...state,
-      filters: { ...newFilters },
-    });
+    if (
+      JSON.stringify(newFilters) !== JSON.stringify(state.filters) ||
+      JSON.stringify(newFiltersMeta) !== JSON.stringify(state.filtersMeta)
+    ) {
+      setState({
+        ...state,
+        filters: { ...newFilters },
+        filtersMeta: { ...newFiltersMeta },
+      });
+    }
+    if (props.discodata_query.search.siteTerm) {
+      setSearchTerm(props.discodata_query.search.siteTerm);
+    } else if (props.discodata_query.search.locationTerm?.text) {
+      setSearchTerm(props.discodata_query.search.locationTerm.text);
+    }
   };
 
   const addNewInput = (key, type, position = 0) => {
@@ -961,7 +1006,6 @@ const View = ({ content, ...props }) => {
           className="search"
           icon="search"
           placeholder="Try search for a site name, country, city, region or ZIP code"
-          iconPosition="right"
           value={searchTerm}
           onChange={(event, data) => {
             autoComplete(data);
@@ -1249,7 +1293,7 @@ const View = ({ content, ...props }) => {
                   placeholder={
                     state.filtersMeta['reporting_years']?.placeholder
                   }
-                  options={state.filtersMeta['reporting_years']?.options}
+                  options={state.filtersMeta['reporting_years']?.options || []}
                   value={state.filters['reportingYear']?.[0]}
                 />
               </div>
@@ -1276,7 +1320,7 @@ const View = ({ content, ...props }) => {
                     });
                   }}
                   placeholder={state.filtersMeta['industries']?.placeholder}
-                  options={state.filtersMeta['industries']?.options}
+                  options={state.filtersMeta['industries']?.options || []}
                   value={state.filters['EEAActivity']?.[0]}
                 />
               </div>