diff --git a/jsconfig.json b/jsconfig.json
index d979573b..80ccf261 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -7,7 +7,7 @@
             "volto-tabsview": [
                 "develop/volto-tabsview/src"
             ],
-            "volto-grid-block": [
+            "@eeacms/volto-grid-block": [
                 "develop/volto-grid-block/src"
             ],
             "volto-datablocks": [
diff --git a/mrs.developer.json b/mrs.developer.json
index d531575f..3083d09f 100644
--- a/mrs.developer.json
+++ b/mrs.developer.json
@@ -13,7 +13,8 @@
   "volto-grid-block": {
     "url": "https://github.com/eea/volto-grid-block.git",
     "branch": "master",
-    "path": "src"
+    "path": "src",
+    "package": "@eeacms/volto-grid-block"
   },
   "volto-datablocks": {
     "url": "https://github.com/eea/volto-datablocks.git",
@@ -22,7 +23,7 @@
   },
   "volto-addons": {
     "url": "https://github.com/eea/volto-addons.git",
-    "branch": "master",
+    "branch": "volto_7",
     "path": "src"
   },
   "volto-embed": {
diff --git a/package.json b/package.json
index a1c264a2..9535daaf 100644
--- a/package.json
+++ b/package.json
@@ -10,9 +10,9 @@
     "@eeacms/volto-slate-metadata-mentions",
     "@eeacms/volto-metadata-block",
     "@eeacms/volto-tabs-block",
+    "@eeacms/volto-grid-block",
     "volto-addons",
-    "volto-datablocks",
-    "volto-grid-block"
+    "volto-datablocks"
   ],
   "scripts": {
     "start": "razzle start",
diff --git a/src/components/manage/Blocks/SidebarBlock/View.jsx b/src/components/manage/Blocks/SidebarBlock/View.jsx
index 4e1fcbfc..a27daa77 100644
--- a/src/components/manage/Blocks/SidebarBlock/View.jsx
+++ b/src/components/manage/Blocks/SidebarBlock/View.jsx
@@ -201,7 +201,7 @@ const makeNewNavigation = (
                 },
                 active: (pathname) => {
                   return (
-                    search.facilityInspireId === facility.facilityInspireId &&
+                    search.installationInspireId === installation &&
                     pathname.includes(item.url)
                   );
                 },
@@ -220,6 +220,7 @@ const makeNewNavigation = (
                       return (
                         search.facilityInspireId ===
                           facility.facilityInspireId &&
+                        search.installationInspireId === installation &&
                         pathname.includes(child.url)
                       );
                     },
@@ -231,6 +232,7 @@ const makeNewNavigation = (
                           setQueryParam({
                             queryParam: {
                               facilityInspireId: facility.facilityInspireId,
+                              installationInspireId: installation,
                             },
                           }),
                         );
diff --git a/src/helpers/api.jsx b/src/helpers/api.jsx
index 968363a1..7ef54f99 100644
--- a/src/helpers/api.jsx
+++ b/src/helpers/api.jsx
@@ -46,7 +46,7 @@ export const getInstallations = (dispatch, siteInspireId) => {
     facilityInspireId,
     string_agg(concat(installationInspireId, ''), ',') as installations
   FROM [IED].[latest].[Browse8Header] as Results
-  WHERE siteInspireId LIKE 'UK.CAED/NRW170267.SITE'
+  WHERE siteInspireId = '${siteInspireId}'
   GROUP BY facilityInspireId`);
   const url = `${settings.providerUrl}?query=${sql}`;
   return new Promise((resolve, reject) => {
@@ -80,7 +80,7 @@ export const getLcps = (dispatch, siteInspireId) => {
     installationInspireId,
     string_agg(concat(lcpInspireId, ''), ',') as lcps
   FROM [IED].[latest].[vw_Browse10_Header] as Results
-  WHERE siteInspireId LIKE '${siteInspireId}'
+  WHERE siteInspireId = '${siteInspireId}'
   GROUP BY facilityInspireId, installationInspireId`);
   const url = `${settings.providerUrl}?query=${sql}`;
   return new Promise((resolve, reject) => {