diff --git a/src/core/fakeData/entityFakes.ts b/src/core/fakeData/entityFakes.ts
index 3d8cf2d..9f68add 100644
--- a/src/core/fakeData/entityFakes.ts
+++ b/src/core/fakeData/entityFakes.ts
@@ -30,6 +30,7 @@ const entityFakeData: {
       name: 'Account10101010',
     },
     {
+      name: 'Account2525252346346',
       accountid: '123123123123',
       evo_account_type: 100000001,
       statecode: 0,
diff --git a/src/core/tools/data.js b/src/core/tools/data.js
index dc3529a..0c6dba5 100644
--- a/src/core/tools/data.js
+++ b/src/core/tools/data.js
@@ -5,10 +5,13 @@ export function objectToOption(obj, entityName) {
     console.warn(`Warning: ${entityName} not found in propsMap!`);
     return obj;
   }
+
+  const name = obj[propsMap[entityName]['name']] || obj['name'];
+  const value = obj[propsMap[entityName]['value']];
   const optionatedObject = {
     ...obj,
-    name: obj[propsMap[entityName]['name']] || `Unknown ${entityName}`,
-    value: obj[propsMap[entityName]['value']],
+    name,
+    value,
   };
   return optionatedObject;
 }