diff --git a/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_base_plugins.js b/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_base_plugins.js
index 80ea859a89..bce0b4ce81 100644
--- a/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_base_plugins.js
+++ b/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_base_plugins.js
@@ -60,12 +60,12 @@ var MS2_BASE_PLUGINS = {
 			"name": "TOC",
 			"cfg": {
 				"activateMapTitle": false,
-				"activateSettingsTool": false,
 				"activateMetedataTool": false,
 				"activateRemoveLayer": false
 			}
 
-		}, {
+		},
+		{
 			"name": "Settings",
 			"cfg": {
 				"wrap": true
diff --git a/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_composer_plugins.js b/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_composer_plugins.js
index 027b9c3e97..3e912d5e0f 100644
--- a/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_composer_plugins.js
+++ b/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_composer_plugins.js
@@ -6,8 +6,6 @@ var MS2_EDIT_PLUGINS = {
 		{
 			"name": "TOC",
 			"cfg": {
-				"activateQueryTool": true,
-				"activateAddLayerButton": true,
 				"activateMetedataTool": false,
 				"spatialOperations": [{
 						"id": "INTERSECTS",
@@ -50,8 +48,15 @@ var MS2_EDIT_PLUGINS = {
 		// ZoomAll, ZoomIn, ZoomOut from base
 		// ScaleBox, FeatureEditor, QueryPanel, MetadataExplorer, GoFull, FullScreen
 		// 	Widgets, WidgetsTray, SaveAs, Notifications TOCItemSettings, from map_viewer_plugins
-
+		"AddLayer",
+		"FilterLayer",
+		"FeatureEditor",
 		"WidgetsBuilder",
-		"Save"
+		{
+			"name": "Save",
+			"cfg": {
+				"disablePermission": true
+			}
+		}
 	]
 }
\ No newline at end of file
diff --git a/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_map_viewer_plugins.js b/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_map_viewer_plugins.js
index 996f840a4a..3fd91a0d34 100644
--- a/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_map_viewer_plugins.js
+++ b/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_map_viewer_plugins.js
@@ -20,7 +20,6 @@ var MS2_MAP_PLUGINS = {
 		{
 			"name": "TOC",
 			"cfg": {
-				"activateQueryTool": true,
 				"activateAddLayerButton": true,
 				"activateMetedataTool": false,
 				"activateSettingsTool": false,
@@ -61,6 +60,8 @@ var MS2_MAP_PLUGINS = {
 				]
 			}
 		},
+		"AddLayer",
+		"FilterLayer",
 		"ScaleBox",
 		// Setting, Toolbar, MapLoading, DrawerMenu, Cookie, OmniBar, Expander,
 		// Undo, Redo, BurgerMenu, MapFooter, Measure, Print
@@ -159,7 +160,12 @@ var MS2_MAP_PLUGINS = {
 		},
 		"Widgets",
 		"WidgetsTray",
-		"SaveAs",
+		{
+			"name": "SaveAs",
+			"cfg": {
+				"disablePermission": true
+			}
+		},
 		"Notifications",
 		"Timeline",
 		"Playback",