diff --git a/cypress/support/trackerAndGeofenceSupport.js b/cypress/support/trackerAndGeofenceSupport.js
index d08b51a1..4b7eee58 100644
--- a/cypress/support/trackerAndGeofenceSupport.js
+++ b/cypress/support/trackerAndGeofenceSupport.js
@@ -1,11 +1,13 @@
 Cypress.Commands.add("addTrackerAndGeofenceEnterExit", (isResponsive, geofenceName) => {
 	if (isResponsive) {
 		cy.get('[data-testid="explore-button-container-Geofences"]').click();
-		cy.get('[data-testid="add-geofence-button-container-mobile"]').click();
+		cy.get('[data-testid="add-geofence-button-container-mobile"]', { timeout: 30000 }).click();
 	} else {
 		cy.get('[class="amplify-flex geofence-button"]').click();
 	}
-	cy.get('[placeholder="Enter address or coordinates"]').type("Empire State Building", { delay: 200 });
+	cy.get('[placeholder="Enter address or coordinates"]', { timeout: 30000 }).type("Empire State Building", {
+		delay: 200
+	});
 	cy.wait(5000);
 	cy.contains("Empire State Building").click();
 	cy.get('[placeholder="Type unique Geofence Name"]').type(`${geofenceName}`, { force: true });
@@ -70,12 +72,14 @@ Cypress.Commands.add("addTrackerAndGeofenceEnterExit", (isResponsive, geofenceNa
 Cypress.Commands.add("addEditAndDeleteGeofence", (isResponsive, geofenceName) => {
 	if (isResponsive) {
 		cy.get('[data-testid="explore-button-container-Geofences"]').click();
-		cy.get('[data-testid="add-geofence-button-container-mobile"]').click();
+		cy.get('[data-testid="add-geofence-button-container-mobile"]', { timeout: 30000 }).click();
 	} else {
 		cy.get('[class="amplify-flex geofence-button"]').click();
 		cy.get('[class="amplify-loader"]').should("not.exist");
 	}
-	cy.get('[placeholder="Enter address or coordinates"]').type("Rio Tinto Perth Western Australia", { delay: 200 });
+	cy.get('[placeholder="Enter address or coordinates"]', { timeout: 30000 }).type("Rio Tinto Perth Western Australia", {
+		delay: 200
+	});
 	cy.wait(4000);
 	isResponsive ? cy.get('[class="amplify-flex suggestion border-top"]').click() : cy.contains("Rio Tinto").click();
 	cy.get('[placeholder="Type unique Geofence Name"]').type(`${geofenceName}`);
diff --git a/src/atomicui/molecules/MapButtons/MapButtons.tsx b/src/atomicui/molecules/MapButtons/MapButtons.tsx
index e95ed2c1..f51a221e 100644
--- a/src/atomicui/molecules/MapButtons/MapButtons.tsx
+++ b/src/atomicui/molecules/MapButtons/MapButtons.tsx
@@ -369,11 +369,12 @@ const MapButtons: FC<MapButtonsProps> = ({
 			// Filter styles based on keyword and selected filters
 			const filteredGroup = styles.filter(item => {
 				const { filters, name } = item as MapStyle;
+
 				const matchesKeyword =
 					filters.provider.toLowerCase().includes(lowerCaseKeyword) ||
 					filters.attribute.some(attr => attr.toLowerCase().includes(lowerCaseKeyword)) ||
 					filters.type.some(type => type.toLowerCase().includes(lowerCaseKeyword)) ||
-					name.toLowerCase().includes(lowerCaseKeyword);
+					t(name).toLowerCase().includes(lowerCaseKeyword);
 
 				const matchesFilters =
 					(selectedFilters.Providers.length === 0 || selectedFilters.Providers.includes(filters.provider)) &&
diff --git a/src/atomicui/organisms/SettingsModal/SettingsModal.tsx b/src/atomicui/organisms/SettingsModal/SettingsModal.tsx
index 929de7cd..b65f2112 100644
--- a/src/atomicui/organisms/SettingsModal/SettingsModal.tsx
+++ b/src/atomicui/organisms/SettingsModal/SettingsModal.tsx
@@ -401,7 +401,7 @@ const SettingsModal: FC<SettingsModalProps> = ({
 						data-testid={`${SettingOptionEnum.MAP_STYLE}-details-component`}
 						gap={0}
 						direction="column"
-						overflow="scroll"
+						overflow="hidden scroll"
 					>
 						{mapButtons}
 					</Flex>
@@ -418,7 +418,7 @@ const SettingsModal: FC<SettingsModalProps> = ({
 						gap={0}
 						direction="column"
 						padding="0rem 1.15rem"
-						overflow="scroll"
+						overflow="hidden scroll"
 						className="language-switcher-container"
 					>
 						{languageSwitcherData.map(({ value, label }, idx) => (