diff --git a/package-lock.json b/package-lock.json
index 780997285..79f6228a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "name-request",
-  "version": "5.2.12",
+  "version": "5.2.13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "name-request",
-      "version": "5.2.12",
+      "version": "5.2.13",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/breadcrumb": "2.1.24",
diff --git a/package.json b/package.json
index 77951c268..dade3ee48 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.2.12",
+  "version": "5.2.13",
   "private": true,
   "appName": "Name Request UI",
   "sbcName": "SBC Common Components",
diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index 2987e5d70..f223fd1ea 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -560,13 +560,6 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
       !this.isSupportedContinuationIn(this.getEntityTypeCd)
     ) return true
 
-    // Conditional for Continuation In Flow.
-    if (
-      this.isContinuationIn &&
-      this.isNumberedCompany &&
-      !this.isSupportedContinuationIn(this.getEntityTypeCd)
-    ) return true
-
     return false
   }
 
diff --git a/src/enums/entity-types.ts b/src/enums/entity-types.ts
index 0665d1fb0..413cde6ee 100644
--- a/src/enums/entity-types.ts
+++ b/src/enums/entity-types.ts
@@ -30,9 +30,9 @@ export enum EntityTypes {
   RLC = CorpTypeCd.XPRO_LIMITED_LIABILITY_COMPANY,
   XCP = CorpTypeCd.XPRO_COOP,
   XCR = CorpTypeCd.XPRO_CORPORATION,
+  XL = CorpTypeCd.XPRO_LL_PARTNR,
   XLL = CorpTypeCd.XPRO_LIMITED_LIABILITY_PARTNERSHIP,
   XLP = CorpTypeCd.XPRO_LIMITED_PARTNERSHIP,
-  XL = CorpTypeCd.XPRO_LL_PARTNR,
   XP = CorpTypeCd.XPRO_LIM_PARTNR,
   XS = CorpTypeCd.XPRO_SOCIETY,
   XSO = CorpTypeCd.XPRO_SOCIETY_NR,
diff --git a/src/list-data/request-action-mapping.ts b/src/list-data/request-action-mapping.ts
index 13a8b17ff..0fe6924ed 100644
--- a/src/list-data/request-action-mapping.ts
+++ b/src/list-data/request-action-mapping.ts
@@ -61,32 +61,31 @@ export const BcMapping: RequestActionMappingI = {
 
 export const XproMapping: RequestActionMappingI = {
   AML: [
-    EntityTypes.XCR,
-    EntityTypes.XCP
+    EntityTypes.XCP, // maps to Corp Type "XCP"
+    EntityTypes.XCR // maps to Corp Type "XCR"
   ],
   ASSUMED: [
-    EntityTypes.XCR,
-    EntityTypes.RLC
+    EntityTypes.RLC, // maps to Corp Type "LLC"
+    EntityTypes.XCR // maps to Corp Type "XCR"
   ],
   REN: [
-    EntityTypes.XCR,
-    EntityTypes.XCP,
-    EntityTypes.RLC
+    EntityTypes.RLC, // maps to Corp Type "LLC"
+    EntityTypes.XCP, // maps to Corp Type "XCP"
+    EntityTypes.XCR // maps to Corp Type "XCR"
   ],
   REH: [
-    EntityTypes.A,
-    EntityTypes.LLC,
-    EntityTypes.XCP,
-    EntityTypes.XSO
+    EntityTypes.RLC, // maps to Corp Type "LLC"
+    EntityTypes.XCP, // maps to Corp Type "XCP"
+    EntityTypes.XSO, // maps to Corp Type "XS"
+    EntityTypes.XUL // maps to Corp Type "A"
   ],
   CHG: [
-    EntityTypes.A,
-    EntityTypes.LLC,
-    EntityTypes.XCP,
-    EntityTypes.XL,
-    EntityTypes.XLL,
-    EntityTypes.XLP,
-    EntityTypes.XP
+    EntityTypes.RLC, // maps to Corp Type "LLC"
+    EntityTypes.XCP, // maps to Corp Type "XCP"
+    EntityTypes.XLL, // maps to Corp Type "XL"
+    EntityTypes.XLP, // maps to Corp Type "XP"
+    EntityTypes.XSO, // maps to Corp Type "XS"
+    EntityTypes.XUL // maps to Corp Type "A"
   ]
 }
 
diff --git a/src/mixins/common-mixin.ts b/src/mixins/common-mixin.ts
index 53967c89b..8c80462c2 100644
--- a/src/mixins/common-mixin.ts
+++ b/src/mixins/common-mixin.ts
@@ -156,12 +156,6 @@ export class CommonMixin extends Vue {
     return (nr?.priorityCd === PriorityCode.YES)
   }
 
-  /** Returns true if the specified entity type is allowed for Incorporation / Registration. */
-  isSupportedIncorporationRegistration (type: EntityTypes): boolean {
-    const supportedEntites = GetFeatureFlag('supported-incorporation-registration-entities')
-    return supportedEntites.includes(type)
-  }
-
   /**
    * Returns true if society NRs are enabled -- in case societies NRs need to be released
    * separately from the Way of Navigating feature changes.
@@ -179,33 +173,39 @@ export class CommonMixin extends Vue {
     ].includes(nr?.legalType)
   }
 
+  /** Returns true if the specified entity type is allowed for incorporation / registration. */
+  isSupportedIncorporationRegistration (type: EntityTypes): boolean {
+    const supportedEntites = GetFeatureFlag('supported-incorporation-registration-entities') || []
+    return supportedEntites.includes(type)
+  }
+
   /** Returns true if the specified request type is allowed for alteration (conversion). */
   isSupportedAlteration (type: NrRequestTypeCodes): boolean {
-    const supportedAlterationTypes = GetFeatureFlag('supported-alteration-types')
+    const supportedAlterationTypes = GetFeatureFlag('supported-alteration-types') || []
     return supportedAlterationTypes.includes(type)
   }
 
   /** Returns true if the specified entity type is allowed for amalgamation. */
   isSupportedAmalgamation (type: EntityTypes): boolean {
-    const supportedAmalgamationEntities = GetFeatureFlag('supported-amalgamation-entities')
+    const supportedAmalgamationEntities = GetFeatureFlag('supported-amalgamation-entities') || []
     return supportedAmalgamationEntities.includes(type)
   }
 
   /** Returns true if the specified entity type is allowed for name change. */
   isSupportedChangeName (type: EntityTypes): boolean {
-    const supportedChangeNameEntities = GetFeatureFlag('supported-name-change-entities')
+    const supportedChangeNameEntities = GetFeatureFlag('supported-name-change-entities') || []
     return supportedChangeNameEntities.includes(type)
   }
 
   /** Returns true if the specified entity type is allowed for continuation in. */
   isSupportedContinuationIn (type: EntityTypes): boolean {
-    const supportedContInEntites = GetFeatureFlag('supported-continuation-in-entities')
+    const supportedContInEntites = GetFeatureFlag('supported-continuation-in-entities') || []
     return supportedContInEntites.includes(type)
   }
 
   /** Returns true if the specified entity type is allowed for restoration/reinstatement. */
   isSupportedRestoration (type: EntityTypes): boolean {
-    const supportedRestorationEntites = GetFeatureFlag('supported-restoration-entities')
+    const supportedRestorationEntites = GetFeatureFlag('supported-restoration-entities') || []
     return supportedRestorationEntites.includes(type)
   }