diff --git a/src/app/datasources/helpers/model-discoverer.service.ts b/src/app/datasources/helpers/model-discoverer.service.ts
index bab0873..c6dcb7e 100644
--- a/src/app/datasources/helpers/model-discoverer.service.ts
+++ b/src/app/datasources/helpers/model-discoverer.service.ts
@@ -37,6 +37,8 @@
   clientUrl?: string; // the view url
   tableCfg?: IXosTableCfg;
   formCfg?: IXosFormCfg;
+  description: string;
+  verbose_name: string;
 }
 
 // Service
@@ -237,8 +239,9 @@
     const parentState: string = this.getParentStateFromModel(model);
 
     try {
+      const name = model.verbose_name ? model.verbose_name : model.name;
       this.XosNavigationService.add({
-        label: this.ConfigHelpers.pluralize(model.name),
+        label: this.ConfigHelpers.pluralize(name),
         state: stateName,
         parent: parentState
       });
diff --git a/src/app/datasources/helpers/model.discoverer.service.spec.ts b/src/app/datasources/helpers/model.discoverer.service.spec.ts
index 94a98e6..7a9e54f 100644
--- a/src/app/datasources/helpers/model.discoverer.service.spec.ts
+++ b/src/app/datasources/helpers/model.discoverer.service.spec.ts
@@ -31,7 +31,9 @@
     ],
     relations: [],
     name: 'Node',
-    app: 'core'
+    app: 'core',
+    description: '',
+    verbose_name: ''
   },
   {
     fields: [
@@ -40,7 +42,9 @@
     ],
     relations: [],
     name: 'VSGTenant',
-    app: 'service.vsg'
+    app: 'service.vsg',
+    description: '',
+    verbose_name: ''
   }
 ];
 
@@ -130,7 +134,9 @@
     const model = {
       name: 'Node',
       app: 'core',
-      fields: []
+      fields: [],
+      description: '',
+      verbose_name: ''
     };
     expect(service.getApiUrlFromModel(model)).toBe('/core/nodes');
   });
@@ -139,7 +145,9 @@
     const model = {
       name: 'Tenant',
       app: 'services.test',
-      fields: []
+      fields: [],
+      description: '',
+      verbose_name: ''
     };
     expect(service.getApiUrlFromModel(model)).toBe('/test/tenants');
   });
@@ -239,6 +247,13 @@
       state: 'xos.vsg.tenant',
       parent: 'xos.vsg'
     });
+
+    service['addNavItem']({name: 'Tenant', verbose_name: 'Verbose', app: 'services.vsg'});
+    expect(MockXosNavigationService.add).toHaveBeenCalledWith({
+      label: 'Verboses',
+      state: 'xos.vsg.tenant',
+      parent: 'xos.vsg'
+    });
   });
 
   it('should cache a model', () => {
diff --git a/src/app/datasources/helpers/search.service.ts b/src/app/datasources/helpers/search.service.ts
index 66748b1..80cef29 100644
--- a/src/app/datasources/helpers/search.service.ts
+++ b/src/app/datasources/helpers/search.service.ts
@@ -66,7 +66,7 @@
   public search(query: string): IXosSearchResult[] {
     this.$log.debug(`[XosSearchService] Searching for: ${query}`);
     const routes: IXosSearchResult[] = _.filter(this.states, s => {
-      return s.label.toLowerCase().indexOf(query) > -1;
+      return s.label.toLowerCase().indexOf(query.toLowerCase()) > -1;
     }).map(r => {
       r.type = 'View';
       return r;