diff --git a/android/app/build.gradle b/android/app/build.gradle
index 178e3cff..c1ddb652 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,8 +113,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 
-def VERSION_CODE = 253
-def VERSION_NAME = "2.18.10"
+def VERSION_CODE = 255
+def VERSION_NAME = "2.18.12"
 
 android {
     namespace "com.avapp"
diff --git a/buildFlavor/field/buildNumber.txt b/buildFlavor/field/buildNumber.txt
index dd4a9006..b8e817d4 100644
--- a/buildFlavor/field/buildNumber.txt
+++ b/buildFlavor/field/buildNumber.txt
@@ -1 +1 @@
-254
\ No newline at end of file
+255
\ No newline at end of file
diff --git a/buildFlavor/field/buildVersion.txt b/buildFlavor/field/buildVersion.txt
index ac69dc88..62b17953 100644
--- a/buildFlavor/field/buildVersion.txt
+++ b/buildFlavor/field/buildVersion.txt
@@ -1 +1 @@
-2.18.11
\ No newline at end of file
+2.18.12
\ No newline at end of file
diff --git a/package.json b/package.json
index e10dd244..7a4ccfd0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "AV_APP",
-  "version": "2.18.10",
-  "buildNumber": "253",
+  "version": "2.18.12",
+  "buildNumber": "255",
   "private": true,
   "scripts": {
     "android:dev": "yarn move:dev && react-native run-android",
diff --git a/src/components/utlis/apiHelper.ts b/src/components/utlis/apiHelper.ts
index 378b9a81..e7f30cf1 100644
--- a/src/components/utlis/apiHelper.ts
+++ b/src/components/utlis/apiHelper.ts
@@ -358,17 +358,19 @@ axiosInstance.interceptors.response.use(
     const url = response?.config?.url;
     const apiKey = getKeyByValue(url, API_URLS);
     sendApiToClickstreamEvent(response, milliseconds, false);
-    logger({
-      msg: 'api response error',
-      extras: {
-        type: 'API_ERROR',
-        timeTaken: String(milliseconds),
-        statusCode: response?.status,
-        endpoint: API_URLS[apiKey as keyof typeof API_URLS],
-        method: response?.config?.method || '',
-      },
-      type: 'error'
-    });
+    if(apiKey) {
+      logger({
+        msg: 'api response error',
+        extras: {
+          type: 'API_ERROR',
+          timeTaken: String(milliseconds),
+          statusCode: response?.status,
+          endpoint: API_URLS[apiKey as keyof typeof API_URLS],
+          method: response?.config?.method || '',
+        },
+        type: 'error'
+      });
+    }
     addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_API_FAILED, {
       statusCode: response?.status,
       url: response?.config?.url,
diff --git a/src/screens/addresses/common/AddressItemAddressString.tsx b/src/screens/addresses/common/AddressItemAddressString.tsx
index 13f49287..54ea7410 100644
--- a/src/screens/addresses/common/AddressItemAddressString.tsx
+++ b/src/screens/addresses/common/AddressItemAddressString.tsx
@@ -6,7 +6,7 @@ import LollipopIcon from '@assets/icons/LollipopIcon';
 import { GenericStyles } from '@rn-ui-lib/styles';
 import { copyAddressToClipboard } from '@screens/addressGeolocation/utils/copyAddressText';
 import MapDirectionIcon from '@assets/icons/MapDirectionIcon';
-import { getGoogleMapUrl, getGoogleMapUrlForAddressText } from '@components/utlis/commonFunctions';
+import { getGoogleMapUrl } from '@components/utlis/commonFunctions';
 import CopyOutlineIcon from '@assets/icons/CopyOutlineIcon';
 import { addClickstreamEvent } from '@services/clickstreamEventService';
 import { CLICKSTREAM_EVENT_NAMES } from '@common/Constants';
@@ -23,20 +23,19 @@ const AddressItemAddressString = (props: ITopAddressItemAddressString) => {
     copyAddressToClipboard(addressText);
   };
 
-  const handleOpenLocation = () => {
-    const isGeoLocation =
-      locationSubType === LocationType.GEO_LOCATION ||
-      locationSubType === LocationType.SKIP_TRACE_ADDRESS;
+  const isGeoLocation =
+    locationSubType === LocationType.GEO_LOCATION ||
+    locationSubType === LocationType.SKIP_TRACE_ADDRESS;
 
+  const handleOpenLocation = () => {
     addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_OPEN_MAP_BUTTON_CLICKED, {
       caseId,
-      ...(isGeoLocation ? { latitude, longitude } : { addressText }),
+      latitude, 
+      longitude,
       locationSubType,
     });
 
-    const mapUrl = isGeoLocation
-      ? getGoogleMapUrl(latitude, longitude)
-      : getGoogleMapUrlForAddressText(addressText);
+    const mapUrl = getGoogleMapUrl(latitude, longitude);
 
     if (mapUrl) {
       return Linking.openURL(mapUrl);
@@ -61,7 +60,7 @@ const AddressItemAddressString = (props: ITopAddressItemAddressString) => {
           <Pressable onPress={handleCopyAddress} hitSlop={{ top: 8, right: 8, bottom: 8, left: 8 }}>
             <CopyOutlineIcon />
           </Pressable>
-          {showMapIcon ? (
+          {showMapIcon && isGeoLocation ? (
             <Pressable
               onPress={handleOpenLocation}
               style={GenericStyles.ml20}
diff --git a/src/screens/caseDetails/feedback/FeedbackDetailAnswerContainer.tsx b/src/screens/caseDetails/feedback/FeedbackDetailAnswerContainer.tsx
index a97a8a39..62da9ca0 100644
--- a/src/screens/caseDetails/feedback/FeedbackDetailAnswerContainer.tsx
+++ b/src/screens/caseDetails/feedback/FeedbackDetailAnswerContainer.tsx
@@ -63,7 +63,11 @@ const FeedbackDetailAnswerContainer: React.FC<IFeedbackDetailAnswerContainer> =
         <FeedbackDetailImageItem image={image} />
       ))}
       {answerList
-        .filter((answer) => answer.questionTag !== OPTION_TAG.IMAGE_UPLOAD)
+        .filter(
+          (answer) =>
+            answer.questionTag !== OPTION_TAG.IMAGE_UPLOAD &&
+            answer.questionTag !== OPTION_TAG.ADDRESS_SELECTION
+        )
         .map((answerItem) => (
           <View style={[GenericStyles.row, GenericStyles.spaceBetween, GenericStyles.mv8]}>
             <Text style={[styles.textContainer, styles.questionText]}>
diff --git a/src/services/clickstreamEventService.ts b/src/services/clickstreamEventService.ts
index 95bdb5d8..ba142c6a 100644
--- a/src/services/clickstreamEventService.ts
+++ b/src/services/clickstreamEventService.ts
@@ -142,6 +142,18 @@ export const sendApiToClickstreamEvent = (
   const method = response?.config?.method;
   if (url) {
     const apiKey = getKeyByValue(url, API_URLS);
+    if (!apiKey) {
+      addClickstreamEvent(
+        { name: 'API_KEY_NOT_FOUND', description: 'API key not exists' },
+        {
+          timeTaken: milliseconds,
+          statusCode,
+          method,
+          endpoint: url,
+          response: statusCode === 400 ? response : '',
+        }
+      );
+    }
     if (apiKey && DISABLE_API_EVENTS_URL.indexOf(apiKey) === -1) {
       const eventName = getEventNameFromAPIKey(apiKey, isSuccess);
       addClickstreamEvent(
diff --git a/src/types/feedback.types.ts b/src/types/feedback.types.ts
index 4a597af8..e1e6af77 100644
--- a/src/types/feedback.types.ts
+++ b/src/types/feedback.types.ts
@@ -16,6 +16,7 @@ export enum AnswerType {
 export enum OPTION_TAG {
   COMMENTS = 'COMMENTS',
   IMAGE_UPLOAD = 'IMAGE_UPLOAD',
+  ADDRESS_SELECTION = 'ADDRESS_SELECTION'
 }
 
 interface IImageMetadata {