diff --git a/client/src/app/data-types.ts b/client/src/app/data-types.ts
index 1d416038e..f042ca683 100644
--- a/client/src/app/data-types.ts
+++ b/client/src/app/data-types.ts
@@ -369,6 +369,11 @@ export namespace Model {
     addresses: Address[];
     local_name: Name;
     remote_name: Name;
+    credential_type: CredentialType;
+    credential_set: CredentialSet;
+    effective_date: string;
+    inactive: boolean;
+    revoked: boolean;
 
     static resourceName = "topic";
 
@@ -498,6 +503,11 @@ export namespace Model {
       return ["/topic", this.type, this.source_id];
     }
 
+    get issuer(): Issuer {
+      return this.credential_type && this.credential_type.issuer;
+    }
+    set issuer(val: Issuer) {}
+
     extLink(...args): string[] {
       return this.link.concat(args);
     }
@@ -515,12 +525,12 @@ export namespace Model {
     static childResource = "related_to";
   }
 
-  export class TopicSearchResult extends Credential {
-    static resourceName = "v3/search/topic";
+  export class TopicSearchResult extends Topic {
+    static resourceName = "v4/search/topic";
   }
 
-  export class TopicFacetSearchResult extends Credential {
-    static resourceName = "v3/search/topic/facets";
+  export class TopicFacetSearchResult extends Topic {
+    static resourceName = "v4/search/topic/facets";
   }
 
   export class TopicRelationship extends BaseModel {
diff --git a/client/src/app/general-data.service.ts b/client/src/app/general-data.service.ts
index 613d8cf08..b5006f228 100644
--- a/client/src/app/general-data.service.ts
+++ b/client/src/app/general-data.service.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpParams } from '@angular/common/http';
 import { Inject, Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
-import { BehaviorSubject, from, Observable, Observer, of, Subscription , throwError as _throw } from 'rxjs';
+import { BehaviorSubject, from, Observable, Observer, of, Subscription, throwError as _throw } from 'rxjs';
 import { catchError, map, mergeMap, shareReplay } from 'rxjs/operators';
 
 import { Fetch, Filter, Model } from './data-types';
@@ -148,27 +148,14 @@ export class GeneralDataService {
       return from([]);
     }
     let params = new HttpParams().set('q', term).append('inactive', inactive.toString());
-
-    return this.loadFromApi('search/autocomplete', params).pipe(
-      map(response => {
-        let ret = [];
-        for (let row of response['results']) {
-          let found = null;
-          for (let name of row.names) {
-            if (~name.text.toLowerCase().indexOf(term.toLowerCase())) {
-              found = name.text;
-              break;
-            } else if (found === null) {
-              found = name.text;
-            }
-          }
-          if (found !== null) {
-            ret.push({ id: row.id, term: found });
-          }
-        }
-        return ret;
-      }),
-    );
+    return this.loadFromApi('v3/search/autocomplete', params)
+      .pipe(
+        map(({ results }: { results? }) => results || []),
+        map(results => results.map(row => ({
+          id: row.id,
+          term: row.value
+        })))
+      );
   }
 
   makeHttpParams(query?: { [key: string]: string } | HttpParams) {
@@ -270,6 +257,8 @@ export class GeneralDataService {
                 count: optitem.count,
               };
             }
+          } else if (optname === 'credential_type_id') {
+            optval.label = this._translate.instant(`name.${optval.label}`)
           }
           if (optidx in options) {
             options[optidx].push(optval);
diff --git a/client/src/app/search/advanced-search.component.ts b/client/src/app/search/advanced-search.component.ts
index 4378dfd39..65c344b04 100644
--- a/client/src/app/search/advanced-search.component.ts
+++ b/client/src/app/search/advanced-search.component.ts
@@ -14,7 +14,8 @@ export interface IAdvancedSearchOption {
 
 const FilterSpec = [
   {
-    name: "name",
+    name: "q",
+    alias: "query",
     hidden: true
   },
   {
@@ -26,7 +27,7 @@ const FilterSpec = [
     label: "cred.issuer"
   },
   {
-    name: "topic_credential_type_id",
+    name: "credential_type_id",
     label: "cred.cred-type"
   },
   {
@@ -43,7 +44,7 @@ const FilterSpec = [
     options: [
       {
         tlabel: "general.show-inactive",
-        value: "true"
+        value: "any"
       }
     ],
     defval: "false",
@@ -77,7 +78,8 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy {
   credentialTypeOptions$: Observable<ISelectOption[]>;
 
   yesNoOptions: ISelectOption[] = [
-    { value: 'true', description: 'Yes' }
+    { value: 'false', description: 'No' },
+    { value: 'any', description: 'Yes' }
   ];
 
   /* TODO: Parameterize these to include a method of defining the input option */
@@ -87,9 +89,6 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy {
     { label: 'historical credentials', helper: 'Include results that have expired or are no longer active.' },
   ];
 
-  yesNoSelected: ISelectOption = { value: 'false', description: 'No' }
-  credentialTypeSelected: ISelectOption = { value: '', description: 'any' };
-
   fg: FormGroup = new FormGroup({
     text: new FormControl(''),
     type: new FormControl(''),
@@ -121,6 +120,15 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy {
     return parseInt(this._currentPage, 10);
   }
 
+  private get _queryParams(): { text: string, type: string, archived: string } {
+    const queryParamMap: any = this.route.snapshot.queryParamMap;
+    const queryParams: any = this.route.snapshot.queryParams;
+    const q = queryParamMap.get('q') || queryParamMap.get('query') || '';
+    const credential_type_id = queryParamMap.get('credential_type_id') || '';
+    const inactive = queryParamMap.get('inactive') || 'false';
+    return { ...queryParams, q, credential_type_id, inactive };
+  }
+
   get filters(): Filter.FieldSet {
     return this._filters;
   }
@@ -139,7 +147,11 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy {
         map(res => res.data.map(type => ({
           value: type.id,
           description: type.description
-        })))
+        }))),
+        map(credentialTypeOptions => [
+          { value: '', description: 'any' },
+          ...credentialTypeOptions
+        ])
       );
 
     this.credentials$ = this._cLoader.stream
@@ -176,17 +188,13 @@ export class AdvancedSearchComponent implements OnInit, OnDestroy {
   }
 
   private patchForm(): void {
-    const queryParamMap: any = this.route.snapshot.queryParamMap;
-    this.fg.patchValue({
-      text: queryParamMap.get('name') || '',
-      type: queryParamMap.get('topic_credential_type_id') || '',
-      archived: queryParamMap.get('inactive') || 'false'
-    });
+    const { q: text, credential_type_id: type, inactive: archived }: any = this._queryParams;
+    this.fg.patchValue({ text, type, archived });
   }
 
   private updateFilters(): void {
-    const { text: name, archived: inactive, type: topic_credential_type_id } = this.fg.value;
-    this._filters.update({ name, inactive, topic_credential_type_id, page: this._currentPage });
+    const { text: q, archived: inactive, type: credential_type_id } = this.fg.value;
+    this._filters.update({ ...this._queryParams, q, inactive, credential_type_id, page: this._currentPage });
   }
 
   private updateUrl() {
diff --git a/client/src/app/search/form.component.ts b/client/src/app/search/form.component.ts
index d824f8a4b..791cfba8b 100644
--- a/client/src/app/search/form.component.ts
+++ b/client/src/app/search/form.component.ts
@@ -9,7 +9,7 @@ import { Subscription } from 'rxjs';
 
 const FilterSpec = [
   {
-    name: "name",
+    name: "q",
     alias: "query",
     hidden: true
   },
@@ -22,10 +22,6 @@ const FilterSpec = [
     name: "issuer_id",
     label: "cred.issuer"
   },
-  {
-    name: "topic_credential_type_id",
-    label: "cred.cred-type"
-  },
   {
     name: "category:entity_type",
     label: "attribute.entity_type"
@@ -36,26 +32,12 @@ const FilterSpec = [
     options: [
       {
         tlabel: "general.show-inactive",
-        value: ""
-      }
-    ],
-    defval: "false",
-    blank: true
-  }
-  /*
-  {
-    name: "revoked",
-    label: "cred.status",
-    options: [
-      {
-        tlabel: "general.show-revoked",
-        value: ""
+        value: "any"
       }
     ],
     defval: "false",
     blank: true
   }
-  */
 ];
 
 @Component({
@@ -131,7 +113,7 @@ export class SearchComponent implements OnInit, OnDestroy, AfterViewInit {
 
   ngAfterViewInit() {
     if(this._searchInput) {
-      this._searchInput.value = this._filters.getFieldValue('name');
+      this._searchInput.value = this._filters.getFieldValue('q');
     }
   }
 
@@ -198,7 +180,7 @@ export class SearchComponent implements OnInit, OnDestroy, AfterViewInit {
       this._loader.reset();
       this._refresh = true;
       this._filters.update({
-        name: this._searchInput.value,
+        q: this._searchInput.value,
         page: '1'
       });
     }
@@ -206,18 +188,18 @@ export class SearchComponent implements OnInit, OnDestroy, AfterViewInit {
 
   public initSearch() {
     if(this._searchInput)
-      this._searchInput.value = this._filters.getFieldValue('name');
+      this._searchInput.value = this._filters.getFieldValue('q');
     this._inited = true;
     this._performSearch();
   }
 
   get blankQuery() {
-    return this._filters.getFieldValue('name') === '';
+    return this._filters.getFieldValue('q') === '';
   }
 
   _performSearch() {
     let query = this._filters.values;
-    if('name' in query && query['name'] !== '') {
+    if('q' in query && query['q'] !== '') {
       this._dataService.loadList(this._loader, {query});
     } else {
       this._loader.reset();
diff --git a/client/src/app/search/input.component.ts b/client/src/app/search/input.component.ts
index 6bc1a607b..56554805d 100644
--- a/client/src/app/search/input.component.ts
+++ b/client/src/app/search/input.component.ts
@@ -1,10 +1,10 @@
 import { Component, AfterViewInit, ElementRef, EventEmitter, Input, Output, Renderer2, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
 import { Observable } from 'rxjs';
-import { catchError, debounceTime, distinctUntilChanged, map, tap, switchMap } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged, map, switchMap } from 'rxjs/operators';
 import { GeneralDataService } from 'app/general-data.service';
 import { HttpService } from 'app/core/services/http.service';
 import { ICredentialTypeResult } from 'app/core/interfaces/icredential-type-results.interface';
-import { Router } from '@angular/router';
 import { AppConfigService } from 'app/app-config.service';
 
 export interface ICredentialTypeOption {
@@ -86,9 +86,10 @@ export class SearchInputComponent implements AfterViewInit {
     private _renderer: Renderer2,
     private _dataService: GeneralDataService,
     private httpSvc: HttpService,
+    private route: ActivatedRoute,
     private router: Router,
     private configSvc: AppConfigService,
-  ) {}
+  ) { }
 
   async ngOnInit() {
     const $categories = this.httpSvc
@@ -185,10 +186,11 @@ export class SearchInputComponent implements AfterViewInit {
   }
 
   advancedSearch() {
+    const queryParams = this.route.snapshot.queryParams;
     const query = this._input.nativeElement.value;
     const lang = this._dataService.language;
 
     const nav = `/${lang}/advanced-search`;
-    query ? this.router.navigate([nav], { queryParams: { name: query } }) : this.router.navigate([nav]);
+    this.router.navigate([nav], { queryParams: { ...queryParams, query: query } });
   }
 }
diff --git a/client/src/app/shared/components/select/select.component.ts b/client/src/app/shared/components/select/select.component.ts
index 4418dceb6..d06ca1894 100644
--- a/client/src/app/shared/components/select/select.component.ts
+++ b/client/src/app/shared/components/select/select.component.ts
@@ -1,6 +1,6 @@
-import { Component, OnInit, Input, forwardRef } from '@angular/core';
-import { LangChangeEvent, TranslateService } from '@ngx-translate/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { Component, Input, forwardRef } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
 
 export interface ISelectOption {
   value: string | boolean | number;
@@ -19,36 +19,34 @@ export interface ISelectOption {
     },
   ],
 })
-export class SelectComponent implements OnInit, ControlValueAccessor {
+export class SelectComponent implements ControlValueAccessor {
+  select = new FormControl('');
+
   @Input() options: ISelectOption[];
-  @Input() selected: ISelectOption;
   @Input() translateSelector: string;
 
-  value: any;
-  disabled: boolean;
-  onChange: (any) => void;
   onTouch: (any) => void;
 
-  writeValue(obj: any): void {
-    this.value = obj;
+  constructor(public translate: TranslateService) { }
+
+  writeValue(value: any): void {
+    value && this.select.setValue(value);
   }
+
   registerOnChange(fn: any): void {
-    this.onChange = fn;
+    this.select.valueChanges.subscribe(fn);
   }
+
   registerOnTouched(fn: any): void {
     this.onTouch = fn;
   }
+
   setDisabledState?(isDisabled: boolean): void {
-    this.disabled = isDisabled;
+    isDisabled ? this.select.disable() : this.select.enable();
   }
 
-  constructor(public translate: TranslateService) { }
-
-  ngOnInit() { }
-
   changeEvent(value: string) {
-    this.value = value;
-    this.onChange(value);
+    this.select.setValue(value);
     this.onTouch(value);
   }
 }
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 040f23b6e..0dc280da9 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -1,12 +1,18 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
 import { CheckboxComponent } from './components/checkbox/checkbox.component';
 import { SelectComponent } from './components/select/select.component';
-import { TranslateModule } from '@ngx-translate/core';
 
 @NgModule({
-  imports: [CommonModule, TranslateModule.forChild()],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    TranslateModule.forChild()
+  ],
   declarations: [CheckboxComponent, SelectComponent],
   exports: [CheckboxComponent, SelectComponent],
 })
-export class SharedModule {}
+export class SharedModule { }
diff --git a/client/themes/base/cred/list.component.html b/client/themes/base/cred/list.component.html
index 19be9b7eb..5de9f47b9 100644
--- a/client/themes/base/cred/list.component.html
+++ b/client/themes/base/cred/list.component.html
@@ -1,3 +1,4 @@
+<!-- Credential cards -->
 <div class="creds-grid" *ngIf="format==='cards' && records?.length">
   <div class="cred-card" *ngFor="let cred of records">
     <div class="cred-icon" *ngIf="cred.issuer.has_logo">
@@ -5,7 +6,8 @@
     </div>
     <div class="cred-detail">
       <p class="cred-title">
-        <a class="body-link cred-link" [routerLink]="cred.topic.extLink('cred', cred.id) | localize">{{cred.credential_type.description}}</a>
+        <a class="body-link cred-link"
+          [routerLink]="cred.topic.extLink('cred', cred.id) | localize">{{cred.credential_type.description}}</a>
       </p>
       <p class="cred-date" *ngIf="cred.effective_date && cred.effective_date > '0100-01-01'; else ifBlank">
         <span class="claim-info date">{{cred.effective_date | dateFormat: 'effectiveDate'}}</span>
@@ -20,11 +22,13 @@
     </div>
   </div>
 </div>
+<!-- Credential list -->
 <div class="creds-list" *ngIf="format==='rows'">
   <div class="row cred-row" *ngFor="let cred of records">
     <div class="col-sm-4">
       <div class="cred-title">
-        <a class="body-link cred-link" [routerLink]="cred.topic.extLink('cred', cred.id) | localize">{{cred.credential_type.description}}</a>
+        <a class="body-link cred-link"
+          [routerLink]="cred.topic.extLink('cred', cred.id) | localize">{{cred.credential_type.description}}</a>
       </div>
       <div class="cred-date" *ngIf="cred.effective_date && cred.effective_date > '0100-01-01'; else ifBlank">
         <span class="claim-info date">{{cred.effective_date | dateFormat: 'effectiveDate'}}</span>
@@ -41,12 +45,12 @@
     </div>
   </div>
 </div>
+<!-- Topic search. TODO: Move into it's own component -->
 <div class="creds-list creds-search" *ngIf="format==='search'">
   <div class="row cred-row" *ngFor="let cred of records">
     <div class="col-md-7">
-      <label>{{cred.topic.typeLabel | translate}}:</label>
-      <a [routerLink]="cred.topic.link | localize"
-        class="body-link cred-link name ml-1">{{cred.topic.names[0].text}}</a>
+      <label>{{cred.typeLabel | translate}}:</label>
+      <a [routerLink]="cred.link | localize" class="body-link cred-link name ml-1">{{cred.names[0].text}}</a>
       <br>
       <small *ngIf="cred.issuer">
         <label>
@@ -78,4 +82,4 @@
       </small>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/client/themes/base/search/advanced-search.component.html b/client/themes/base/search/advanced-search.component.html
index 7df43341f..cd76f7b93 100644
--- a/client/themes/base/search/advanced-search.component.html
+++ b/client/themes/base/search/advanced-search.component.html
@@ -12,10 +12,10 @@ <h4 class="col-md-5 d-none d-md-block">What this search type does</h4>
       <input class="form-control" formControlName="text">
     </app-advanced-search-row>
     <app-advanced-search-row [label]="searchOptions[1].label" [helper]="searchOptions[1].helper">
-      <app-select formControlName="type" [options]="options" [translateSelector]="'name'" [selected]="credentialTypeSelected"></app-select>
+      <app-select formControlName="type" [options]="options" [translateSelector]="'name'"></app-select>
     </app-advanced-search-row>
     <app-advanced-search-row [label]="searchOptions[2].label" [helper]="searchOptions[2].helper">
-      <app-select formControlName="archived" [options]="yesNoOptions" [selected]="yesNoSelected"></app-select>
+      <app-select formControlName="archived" [options]="yesNoOptions"></app-select>
     </app-advanced-search-row>
     <button type="submit" class="btn btn-primary mt-2" (click)="submit()">
       Advanced Search
diff --git a/client/themes/base/search/input.component.html b/client/themes/base/search/input.component.html
index cf42fd1fe..cbbff6277 100644
--- a/client/themes/base/search/input.component.html
+++ b/client/themes/base/search/input.component.html
@@ -1,25 +1,15 @@
 <div [ngClass]="{ 'large-search': true, active: focused }">
-  <input
-    #queryInput
-    type="text"
-    id="queryInput"
-    name="query"
-    size="40"
-    autocomplete="off"
-    autocorrect="off"
-    autocapitalize="off"
-    spellcheck="false"
-    [ngbTypeahead]="typeaheadSearch"
-    (selectItem)="typeaheadSelected($event)"
-    [focusFirst]="false"
-  />
+  <input #queryInput type="text" id="queryInput" name="query" size="40" autocomplete="off" autocorrect="off"
+    autocapitalize="off" spellcheck="false" [ngbTypeahead]="typeaheadSearch" (selectItem)="typeaheadSelected($event)"
+    [focusFirst]="false" />
   <button #queryButton class="btn btn-primary">
-    <span class="load" *ngIf="loading"><div class="loading-indicator"></div></span>
+    <span class="load" *ngIf="loading">
+      <div class="loading-indicator"></div>
+    </span>
     <span class="fa fa-search" *ngIf="!loading"></span>
   </button>
 </div>
 <div class="text-left mt-1">
-  <a [ngClass]="{ 'text-white': textColour === 'text-white' }" (click)="advancedSearch()" routerLinkActive="router-link-active"
-    >Advanced Search</a
-  >
-</div>
+  <a [ngClass]="{ 'text-white': textColour === 'text-white' }" (click)="advancedSearch()"
+    routerLinkActive="router-link-active">Advanced Search</a>
+</div>
\ No newline at end of file
diff --git a/client/themes/base/shared/select.component.html b/client/themes/base/shared/select.component.html
index 95016ebda..46b3e101b 100644
--- a/client/themes/base/shared/select.component.html
+++ b/client/themes/base/shared/select.component.html
@@ -1,13 +1,5 @@
-<select class="inline-select form-control" id="inlineFormCustomSelect" [value]="value"
-  (change)="changeEvent($event.target.value)">
+<select [formControl]="select" class="inline-select form-control" id="inlineFormCustomSelect">
   <ng-container *ngIf="options">
-    <option selected [value]="selected.value">
-      <ng-container *ngIf="translateSelector; then selector; else noSelector"></ng-container>
-      <ng-template #selector let-translateSelector>
-        {{ (translateSelector + '.' + selected.description) | translate }}
-      </ng-template>
-      <ng-template #noSelector>{{ selected.description | translate }}</ng-template>
-    </option>
     <option *ngFor="let option of options" [value]="option.value">
       <ng-container *ngIf="translateSelector; then selector; else noSelector"></ng-container>
       <ng-template #selector let-translateSelector>
diff --git a/client/themes/bcgov/cred/list.component.html b/client/themes/bcgov/cred/list.component.html
index 0b0b20a7a..205df4225 100644
--- a/client/themes/bcgov/cred/list.component.html
+++ b/client/themes/bcgov/cred/list.component.html
@@ -1,3 +1,4 @@
+<!-- Credential cards -->
 <div class="creds-grid" *ngIf="format === 'cards' && records?.length">
   <div class="cred-card" *ngFor="let cred of records">
     <div class="cred-icon" *ngIf="cred.issuer.has_logo">
@@ -20,11 +21,11 @@
         ">
         <span class="claim-info date">{{
           cred.effective_date | dateFormat: 'effectiveDate'
-        }}</span>
+          }}</span>
       </p>
       <p class="cred-issuer" *ngIf="cred.issuer">
-        <a class="body-link issuer-link"
-          [routerLink]="['/issuer', cred.issuer.id] | localize">{{ cred.issuer.name }}</a>
+        <a class="body-link issuer-link" [routerLink]="['/issuer', cred.issuer.id] | localize">{{ cred.issuer.name
+          }}</a>
       </p>
       <div class="cred-status">
         <div class="badge badge-warning" *ngIf="cred.inactive" translate>
@@ -37,6 +38,7 @@
     </div>
   </div>
 </div>
+<!-- Credential list -->
 <div class="creds-list" *ngIf="format === 'rows'">
   <ng-container *ngIf="stateSvc.filterActive === 'true'; else archiveTemplate">
     <div class="row cred-row" *ngFor="let cred of records">
@@ -52,13 +54,13 @@
           ">
           <span class="claim-info date">{{
             cred.effective_date | dateFormat: 'effectiveDate'
-          }}</span>
+            }}</span>
         </div>
       </div>
       <div class="col-sm-4">
         <div class="cred-issuer" *ngIf="cred.issuer">
-          <a class="body-link issuer-link"
-            [routerLink]="['/issuer', cred.issuer.id] | localize">{{ cred.issuer.name }}</a>
+          <a class="body-link issuer-link" [routerLink]="['/issuer', cred.issuer.id] | localize">{{ cred.issuer.name
+            }}</a>
         </div>
       </div>
       <div class="col-sm-4">
@@ -92,14 +94,15 @@
     </ng-container>
   </ng-template>
 </div>
+<!-- Topic search. TODO: Move into it's own component -->
 <div class="creds-list creds-search" *ngIf="format === 'search'">
   <div class="row cred-row" *ngFor="let cred of records; index as idx">
     <div class="col-lg-8">
       <div class="cred-title">
-        <a [routerLink]="cred.topic.link | localize" class="body-link cred-link name">
-          {{ cred.topic.displayName.text }}
+        <a [routerLink]="cred.link | localize" class="body-link cred-link name">
+          {{ cred.displayName.text }}
         </a>
-        <div class="cred-topic small" *ngIf="cred.topic as topic">
+        <div class="cred-topic small" *ngIf="cred as topic">
           {{ topic.typeLabel | translate }}
           <span class="cred-entity-status" *ngIf="topic.attribute_map.entity_status as status">:
             <attribute-view [record]="status"></attribute-view>
@@ -114,8 +117,8 @@
     <div class="col-lg-4">
       <small *ngIf="cred.issuer">
         <label> <span translate>cred.issuer</span>: </label>
-        <a [routerLink]="['/issuer', cred.issuer.id] | localize"
-          class="body-link issuer-link">{{ cred.issuer.name }}</a>
+        <a [routerLink]="['/issuer', cred.issuer.id] | localize" class="body-link issuer-link">{{ cred.issuer.name
+          }}</a>
       </small>
       <br />
       <small>
@@ -123,7 +126,7 @@
         <div *ngIf="cred.effective_date > '0100-01-01'; else ifBlank">
           <span class="claim-info date">{{
             cred.effective_date | dateFormat: 'effectiveDate'
-          }}</span>
+            }}</span>
         </div>
         <ng-template #ifBlank>
           <div class="col-sm-8">{{ 'cred.empty-attribute' | translate }}</div>
diff --git a/client/themes/ongov/cred/list.component.html b/client/themes/ongov/cred/list.component.html
index f9f007815..0bd554031 100644
--- a/client/themes/ongov/cred/list.component.html
+++ b/client/themes/ongov/cred/list.component.html
@@ -1,42 +1,48 @@
+<!-- Credential list -->
 <div class="creds-list" *ngIf="format !='search'">
     <div *ngFor="let cred of records">
-    <div class="cred" *ngIf="cred.credential_type.schema.name.indexOf('registration') != -1">
-        <div class="card name-panel">
-            <div class="card-header panel-heading" >
-                <a [title]="[cred.issuer.name]" tabindex="0" class="header-link"  [routerLink]="['/issuer', cred.issuer.id] | localize">{{cred.issuer.abbreviation}} </a>
-            </div>
+        <div class="cred" *ngIf="cred.credential_type.schema.name.indexOf('registration') != -1">
+            <div class="card name-panel">
+                <div class="card-header panel-heading">
+                    <a [title]="[cred.issuer.name]" tabindex="0" class="header-link"
+                        [routerLink]="['/issuer', cred.issuer.id] | localize">{{cred.issuer.abbreviation}} </a>
+                </div>
 
-            <div class="card-body form-body">
-                <a tabindex="0" [title]="'cred.business_registration' | translate" class="body-link control-label"  [routerLink]="cred.topic.extLink('cred', cred.id) | localize" translate>cred.business_registration</a>
-                <div class="form-field cert-image w-25 ml-auto">
-                    <img [alt]="'cred.verify-info'| translate" src="assets/cert.svg">
+                <div class="card-body form-body">
+                    <a tabindex="0" [title]="'cred.business_registration' | translate" class="body-link control-label"
+                        [routerLink]="cred.topic.extLink('cred', cred.id) | localize"
+                        translate>cred.business_registration</a>
+                    <div class="form-field cert-image w-25 ml-auto">
+                        <img [alt]="'cred.verify-info'| translate" src="assets/cert.svg">
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-    </div>
 </div>
+<!-- Topic search. TODO: Move into it's own component -->
 <div class="creds-list creds-search" *ngIf="format==='search'">
     <div class="row cred-row" *ngFor="let cred of records">
-        <div class="col" *ngIf="cred.names.length > 0"> <!-- temp issue with search returning blank topics -->
+        <div class="col" *ngIf="cred.names.length > 0">
+            <!-- temp issue with search returning blank topics -->
             <div class="row">
                 <div class="col">
-                    <a tabindex="0" [title]="cred.names[0].text"  [routerLink]="cred.topic.link | localize"
-                      class="body-link cred-link name">{{cred.names[0].text}}</a>
+                    <a tabindex="0" [title]="cred.names[0].text" [routerLink]="cred.link | localize"
+                        class="body-link cred-link name">{{cred.names[0].text}}</a>
                 </div>
             </div>
             <div class="row">
                 <div class="col cred-info" tabindex="0">
-                    <small *ngIf="cred.topic.attribute_map['entity_type'] as topic_type">
+                    <small *ngIf="cred.attribute_map['entity_type'] as topic_type">
                         {{('business_type.' + topic_type.value) | translate}}
                     </small>
                 </div>
                 <div class="col cred-address" tabindex="0">
-                    <small *ngIf="cred.topic.addresses.length > 0">
-                        <address-view [record]="cred.topic.addresses[0]" style="float: right"></address-view>
+                    <small *ngIf="cred.addresses.length > 0">
+                        <address-view [record]="cred.addresses[0]" style="float: right"></address-view>
                     </small>
                 </div>
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/server/solr/cores/credential_registry/conf/schema.xml b/server/solr/cores/credential_registry/conf/schema.xml
index 90ccc6354..09754d395 100644
--- a/server/solr/cores/credential_registry/conf/schema.xml
+++ b/server/solr/cores/credential_registry/conf/schema.xml
@@ -53,6 +53,8 @@
     <field name="name_suggest" type="edge_ngram" indexed="true" stored="false" multiValued="true"/>
     <copyField source="name" dest="name_suggest"/>
 
+    <!-- The following fields are introduced in v3 -->
+
     <field name="name_text_suggest" type="edge_ngram" indexed="true" stored="false" multiValued="true"/>
     <copyField source="name_text" dest="name_text_suggest"/>
 
@@ -62,12 +64,20 @@
     <field name="topic_source_id_suggest" type="edge_ngram" indexed="true" stored="false" multiValued="true"/>
     <copyField source="topic_source_id" dest="topic_source_id_suggest"/>
 
+    <field name="topic_name_suggest" type="edge_ngram" indexed="true" stored="false" multiValued="true"/>
+    <copyField source="topic_name" dest="topic_name_suggest"/>
+
+    <field name="topic_address_suggest" type="edge_ngram" indexed="true" stored="false" multiValued="true"/>
+    <copyField source="topic_address" dest="topic_address_suggest"/>
+
     <!--
     ### More exact matching on name, used to score results
     -->
     <copyField source="name" dest="name_precise"/>
     <field name="name_precise" type="text_general" indexed="true" stored="false" multiValued="true"/>
 
+    <!-- The following fields are introduced in v3 -->
+
     <copyField source="name_text" dest="name_text_precise"/>
     <field name="name_text_precise" type="text_general" indexed="true" stored="false" multiValued="true"/>
 
@@ -77,6 +87,12 @@
     <copyField source="topic_source_id" dest="topic_source_id_precise"/>
     <field name="topic_source_id_precise" type="text_general" indexed="true" stored="false" multiValued="true"/>
 
+    <copyField source="topic_name" dest="topic_name_precise"/>
+    <field name="topic_name_precise" type="text_general" indexed="true" stored="false" multiValued="true"/>
+
+    <copyField source="topic_address" dest="topic_address_precise"/>
+    <field name="topic_address_precise" type="text_general" indexed="true" stored="false" multiValued="true"/>
+
     <fieldType name="text_tokens" class="solr.TextField" positionIncrementGap="100">
         <analyzer>
             <tokenizer class="solr.StandardTokenizerFactory"/>
@@ -123,54 +139,32 @@
     </fieldType>
 
     <!-- Unorganized fields -->
-
     <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
     <field name="django_ct" type="string" indexed="true" stored="true" multiValued="false"/>
     <field name="django_id" type="string" indexed="true" stored="true" multiValued="false"/>
-
     <field name="document" type="text_en" indexed="true" stored="true" multiValued="false" />
-
-    <field name="credential_set_id" type="long" indexed="true" stored="true" multiValued="false" />
-
-    <field name="credential_type_id" type="long" indexed="true" stored="true" multiValued="false" />
-
-    <field name="topic_credential_type_id" type="long" indexed="true" stored="true" multiValued="true" />
-
-    <field name="topic_type" type="string" indexed="true" stored="true" multiValued="false" />
-
-    <field name="topic_id" type="long" indexed="true" stored="true" multiValued="false" />
-
     <field name="category" type="string" indexed="true" stored="true" multiValued="true" />
-
     <field name="location" type="text_en" indexed="true" stored="true" multiValued="true" />
-
     <field name="name" type="text_en" indexed="true" stored="true" multiValued="true" />
-
     <field name="create_timestamp" type="date" indexed="true" stored="true" multiValued="false" />
-
     <field name="effective_date" type="date" indexed="true" stored="true" multiValued="false" />
-
     <field name="inactive" type="boolean" indexed="true" stored="true" multiValued="false" />
-
     <field name="revoked" type="boolean" indexed="true" stored="true" multiValued="false" />
-
     <field name="revoked_date" type="date" indexed="true" stored="true" multiValued="false" />
-
     <field name="latest" type="boolean" indexed="true" stored="true" multiValued="false" />
-
     <field name="issuer_id" type="long" indexed="true" stored="true" multiValued="false" />
-
     <field name="source_id" type="string" indexed="true" stored="true" multiValued="false" />
-
     <field name="schema_name" type="string" indexed="true" stored="true" multiValued="false" />
-
     <field name="schema_version" type="string" indexed="true" stored="true" multiValued="false" />
 
-    <field name="credential_id" type="string" indexed="true" stored="true" multiValued="false" />
-
     <!-- Begin organized schemas -->
     <!-- field name should being with index name follow by an underscore -->
 
+    <!-- CredentialIndex -->
+    <field name="credential_id" type="string" indexed="true" stored="true" multiValued="false" />
+    <field name="credential_set_id" type="long" indexed="true" stored="true" multiValued="false" />
+    <field name="credential_type_id" type="long" indexed="true" stored="true" multiValued="false" />
+
     <!-- NameIndex -->
     <field name="name_text" type="string" indexed="true" stored="true" multiValued="false" />
     <field name="name_type" type="string" indexed="true" stored="true" multiValued="false" />
@@ -188,11 +182,20 @@
     <field name="address_credential_revoked" type="boolean" indexed="true" stored="true" multiValued="false" />
 
     <!-- TopicIndex -->
+    <field name="topic_id" type="long" indexed="true" stored="true" multiValued="false" />
     <field name="topic_source_id" type="string" indexed="true" stored="true" multiValued="false" />
+    <field name="topic_issuer_id" type="long" indexed="true" stored="true" multiValued="false" />
+    <field name="topic_type_id" type="long" indexed="true" stored="true" multiValued="false" />
+    <field name="topic_type" type="string" indexed="true" stored="true" multiValued="false" />
+    <field name="topic_inactive" type="boolean" indexed="true" stored="true" multiValued="false" />
+    <field name="topic_revoked" type="boolean" indexed="true" stored="true" multiValued="false" />
+    <field name="topic_name" type="string" indexed="true" stored="true" multiValued="true" />
+    <field name="topic_address" type="string" indexed="true" stored="true" multiValued="true" />
+    <field name="topic_category" type="string" indexed="true" stored="true" multiValued="true" />
+    <field name="topic_credential_type_id" type="long" indexed="true" stored="true" multiValued="true" />
     <field name="topic_all_credentials_inactive" type="boolean" indexed="true" stored="true" multiValued="false" />
     <field name="topic_all_credentials_revoked" type="boolean" indexed="true" stored="true" multiValued="false" />
 
-
     <uniqueKey>id</uniqueKey>
 
     <!--
diff --git a/server/vcr-server/api/v2/serializers/search.py b/server/vcr-server/api/v2/serializers/search.py
index 497b2d2fe..5d259c957 100644
--- a/server/vcr-server/api/v2/serializers/search.py
+++ b/server/vcr-server/api/v2/serializers/search.py
@@ -305,24 +305,20 @@ class Meta:
         fields = [
             "category",
             "credential_type_id",
-            "issuer_id",
-            # "inactive",
-            # "topic_type",
+            "issuer_id"
         ]
         field_options = {
             "category": {},
             "credential_type_id": {},
             "issuer_id": {},
-            # "inactive": {},
-            # "topic_type": {},
-            # date faceting isn't working, needs to use Solr range faceting
-            # https://github.com/django-haystack/django-haystack/issues/1572
-            #             "effective_date": {
-            #                 "start_date": datetime.now() - timedelta(days=50000),
-            #                 "end_date": datetime.now(),
-            #                 "gap_by": "month",
-            #                 "gap_amount": 3
-            #             },
+            # Date faceting isn't working, needs to use Solr range faceting
+            # See: https://github.com/django-haystack/django-haystack/issues/1572
+            # "effective_date": {
+            #     "start_date": datetime.now() - timedelta(days=50000),
+            #     "end_date": datetime.now(),
+            #     "gap_by": "month",
+            #     "gap_amount": 3
+            # },
         }
 
     def get_fields(self):
diff --git a/server/vcr-server/api/v2/urls.py b/server/vcr-server/api/v2/urls.py
index aa146acfb..4323d4929 100644
--- a/server/vcr-server/api/v2/urls.py
+++ b/server/vcr-server/api/v2/urls.py
@@ -39,15 +39,12 @@
 router.register(r"topic_relationship", rest.TopicRelationshipViewSet)
 
 # Search endpoints
-router.register(
-    r"search/credential/topic",
-    search.CredentialTopicSearchView,
-    "Credential Topic Search",
-)
-router.register(r"search/credential", search.CredentialSearchView, "Credential Search")
-router.register(
-    r"search/autocomplete", search.NameAutocompleteView, "Name Autocomplete"
-)
+router.register(r"search/credential/topic",
+                search.CredentialTopicSearchView, "Credential Topic Search")
+router.register(r"search/credential",
+                search.CredentialSearchView, "Credential Search")
+router.register(r"search/autocomplete",
+                search.NameAutocompleteView, "Name Autocomplete")
 
 # Misc endpoints
 miscPatterns = [
diff --git a/server/vcr-server/api/v2/views/search.py b/server/vcr-server/api/v2/views/search.py
index fc3715b3a..89aceec42 100644
--- a/server/vcr-server/api/v2/views/search.py
+++ b/server/vcr-server/api/v2/views/search.py
@@ -234,12 +234,6 @@ def facets(self, request):
         facet_queryset = self.filter_facet_queryset(queryset)
         result_queryset = self.filter_queryset(queryset)
 
-        # for facet in request.query_params.getlist(self.facet_query_params_text):
-        # if ":" not in facet:
-        #    continue
-        # field, value = facet.split(":", 1)
-        # if value:
-        #    queryset = queryset.narrow('%s:"%s"' % (field, queryset.query.clean(value)))
         for key in ("category", "credential_type_id", "topic_credential_type_id", "issuer_id"):
             for value in request.query_params.getlist(key):
                 if value:
diff --git a/server/vcr-server/api/v3/indexes/Topic.py b/server/vcr-server/api/v3/indexes/Topic.py
index 411b75852..c82466f32 100644
--- a/server/vcr-server/api/v3/indexes/Topic.py
+++ b/server/vcr-server/api/v3/indexes/Topic.py
@@ -12,12 +12,74 @@ class TopicIndex(TxnAwareSearchIndex, indexes.Indexable):
     document = indexes.CharField(document=True)
 
     topic_source_id = indexes.CharField(model_attr="source_id")
+    topic_issuer_id = indexes.IntegerField()
+    topic_type_id = indexes.IntegerField()
+    topic_inactive = indexes.BooleanField()
+    topic_revoked = indexes.BooleanField()
+    topic_name = indexes.MultiValueField()
+    topic_address = indexes.MultiValueField()
+    topic_category = indexes.MultiValueField()
+    topic_credential_type_id = indexes.MultiValueField()
     topic_all_credentials_inactive = indexes.BooleanField()
     topic_all_credentials_revoked = indexes.BooleanField()
 
     def get_model(self):
         return TopicModel
 
+    @staticmethod
+    def prepare_topic_issuer_id(obj):
+        if obj.foundational_credential:
+            return obj.foundational_credential.credential_type.issuer_id
+        return None
+
+    @staticmethod
+    def prepare_topic_type_id(obj):
+        if obj.foundational_credential:
+            return obj.foundational_credential.credential_type_id
+        return None
+
+    @staticmethod
+    def prepare_topic_inactive(obj):
+        if obj.foundational_credential:
+            return obj.foundational_credential.inactive
+        return None
+
+    @staticmethod
+    def prepare_topic_revoked(obj):
+        if obj.foundational_credential:
+            return obj.foundational_credential.revoked
+        return None
+
+    @staticmethod
+    def prepare_topic_category(obj):
+        if obj.foundational_credential:
+            return [
+                f"{cat.type}::{cat.value}" for cat in obj.foundational_credential.all_categories
+            ]
+        return []
+
+    @staticmethod
+    def prepare_topic_name(obj):
+        # May need to expand this to inactive credentials
+        return [
+            name.text for name in obj.get_active_names()
+        ]
+
+    @staticmethod
+    def prepare_topic_address(obj):
+        # May need to expand this to inactive credentials
+        return [
+            address.civic_address for address in obj.get_active_addresses()
+        ]
+
+    @staticmethod
+    def prepare_topic_credential_type_id(obj):
+        # May need to expand this to inactive credentials
+        credential_type_ids = obj.get_active_credential_type_ids()
+        if credential_type_ids:
+            return list(credential_type_ids)
+        return []
+
     @staticmethod
     def prepare_topic_all_credentials_inactive(obj):
         all_creds_inactive = True
diff --git a/server/vcr-server/api/v3/search_indexes.py b/server/vcr-server/api/v3/search_indexes.py
index 61b678547..f9a38ae3b 100644
--- a/server/vcr-server/api/v3/search_indexes.py
+++ b/server/vcr-server/api/v3/search_indexes.py
@@ -2,4 +2,4 @@
 
 from .indexes.Name import NameIndex
 from .indexes.Address import AddressIndex
-from .indexes.Topic import TopicIndex
+from .indexes.Topic import TopicIndex
\ No newline at end of file
diff --git a/server/vcr-server/api/v3/serializers/rest.py b/server/vcr-server/api/v3/serializers/rest.py
deleted file mode 100644
index 8c04f493e..000000000
--- a/server/vcr-server/api/v3/serializers/rest.py
+++ /dev/null
@@ -1,246 +0,0 @@
-# from rest_framework.serializers import (
-#     BooleanField,
-#     ModelSerializer,
-#     SerializerMethodField,
-# )
-
-# from api.v2 import utils
-# from api.v2.models.Address import Address
-# from api.v2.models.Attribute import Attribute
-# from api.v2.models.Claim import Claim
-# from api.v2.models.Credential import Credential
-# from api.v2.models.CredentialSet import CredentialSet
-# from api.v2.models.CredentialType import CredentialType
-# from api.v2.models.Issuer import Issuer
-# from api.v2.models.Name import Name
-# from api.v2.models.Schema import Schema
-# from api.v2.models.Topic import Topic
-# from api.v2.models.TopicRelationship import TopicRelationship
-
-
-# class IssuerSerializer(ModelSerializer):
-#     has_logo = BooleanField(source="get_has_logo", read_only=True)
-
-#     class Meta:
-#         model = Issuer
-#         exclude = ("logo_b64",)
-
-
-# class SchemaSerializer(ModelSerializer):
-#     class Meta:
-#         model = Schema
-#         fields = "__all__"
-
-
-# class CredentialSetSerializer(ModelSerializer):
-#     class Meta:
-#         model = CredentialSet
-#         fields = (
-#             "id",
-#             "create_timestamp",
-#             "update_timestamp",
-#             "latest_credential_id",
-#             "topic_id",
-#             "first_effective_date",
-#             "last_effective_date",
-#         )
-
-
-# class CredentialTypeSerializer(ModelSerializer):
-#     issuer = IssuerSerializer()
-#     has_logo = BooleanField(source="get_has_logo", read_only=True)
-
-#     class Meta:
-#         model = CredentialType
-#         depth = 1
-#         exclude = (
-#             "category_labels",
-#             "claim_descriptions",
-#             "claim_labels",
-#             "logo_b64",
-#             "processor_config",
-#             "visible_fields",
-#         )
-
-
-# class CredentialTypeExtSerializer(CredentialTypeSerializer):
-#     class Meta:
-#         model = CredentialType
-#         depth = 1
-#         exclude = ("logo_b64",)
-
-
-# class TopicSerializer(ModelSerializer):
-#     class Meta:
-#         model = Topic
-#         fields = list(
-#             utils.fetch_custom_settings("serializers", "Topic", "includeFields")
-#         )
-
-
-# class TopicRelationshipSerializer(ModelSerializer):
-#     class Meta:
-#         model = TopicRelationship
-#         fields = list(
-#             utils.fetch_custom_settings(
-#                 "serializers", "TopicRelationship", "includeFields"
-#             )
-#         )
-
-
-# class AddressSerializer(ModelSerializer):
-#     class Meta:
-#         model = Address
-#         fields = list(
-#             utils.fetch_custom_settings("serializers", "Address", "includeFields")
-#         )
-
-
-# class ClaimSerializer(ModelSerializer):
-#     class Meta:
-#         model = Claim
-#         fields = "__all__"
-
-
-# class NameSerializer(ModelSerializer):
-#     class Meta:
-#         model = Name
-#         fields = "__all__"
-
-
-# class AttributeSerializer(ModelSerializer):
-#     class Meta:
-#         model = Attribute
-#         fields = "__all__"
-
-
-# class CredentialAttributeSerializer(AttributeSerializer):
-#     class Meta(AttributeSerializer.Meta):
-#         fields = ("id", "type", "format", "value", "credential_id")
-
-
-# class CredentialSerializer(ModelSerializer):
-#     attributes = CredentialAttributeSerializer(source="all_attributes", many=True)
-
-#     class Meta:
-#         model = Credential
-#         fields = (
-#             "topic",
-#             "credential_set",
-#             "credential_type",
-#             "credential_id",
-#             "credential_def_id",
-#             "cardinality_hash",
-#             "effective_date",
-#             "inactive",
-#             "latest",
-#             "revoked",
-#             "revoked_date",
-#             "revoked_by",
-#             "related_topics",
-#             "attributes",
-#         )
-
-
-# class CredentialAddressSerializer(AddressSerializer):
-#     class Meta(AddressSerializer.Meta):
-#         fields = tuple(
-#             {*AddressSerializer.Meta.fields, "credential_id"} - {"credential"}
-#         )
-
-
-# class CredentialNameSerializer(NameSerializer):
-#     class Meta(NameSerializer.Meta):
-#         fields = ("id", "text", "language", "credential_id", "type")
-
-
-# class CredentialTopicSerializer(TopicSerializer):
-#     class Meta(TopicSerializer.Meta):
-#         fields = ("id", "create_timestamp", "update_timestamp", "source_id", "type")
-
-
-# class CredentialNamedTopicSerializer(CredentialTopicSerializer):
-#     names = CredentialNameSerializer(source="get_active_names", many=True)
-#     local_name = CredentialNameSerializer(source="get_local_name")
-#     remote_name = CredentialNameSerializer(source="get_remote_name")
-
-#     class Meta(CredentialTopicSerializer.Meta):
-#         fields = CredentialTopicSerializer.Meta.fields + (
-#             "names",
-#             "local_name",
-#             "remote_name",
-#         )
-
-
-# class TopicAttributeSerializer(AttributeSerializer):
-#     credential_type_id = SerializerMethodField()
-
-#     class Meta(CredentialAttributeSerializer.Meta):
-#         fields = (
-#             "id",
-#             "type",
-#             "format",
-#             "value",
-#             "credential_id",
-#             "credential_type_id",
-#         )
-
-#     def get_credential_type_id(self, obj):
-#         return obj.credential.credential_type_id
-
-
-# class CredentialTopicExtSerializer(CredentialNamedTopicSerializer):
-#     addresses = CredentialAddressSerializer(source="get_active_addresses", many=True)
-#     attributes = TopicAttributeSerializer(source="get_active_attributes", many=True)
-
-#     class Meta(CredentialNamedTopicSerializer.Meta):
-#         fields = CredentialNamedTopicSerializer.Meta.fields + (
-#             "addresses",
-#             "attributes",
-#         )
-
-
-# class CredentialExtSerializer(CredentialSerializer):
-#     addresses = CredentialAddressSerializer(many=True)
-#     attributes = CredentialAttributeSerializer(many=True)
-#     credential_type = CredentialTypeSerializer()
-#     names = CredentialNameSerializer(many=True)
-#     local_name = CredentialNameSerializer(source="get_local_name")
-#     remote_name = CredentialNameSerializer(source="get_remote_name")
-#     topic = CredentialTopicExtSerializer()
-#     related_topics = CredentialNamedTopicSerializer(many=True)
-
-#     class Meta(CredentialSerializer.Meta):
-#         depth = 1
-#         fields = (
-#             "id",
-#             "create_timestamp",
-#             "effective_date",
-#             "inactive",
-#             "latest",
-#             "revoked",
-#             "revoked_date",
-#             "credential_id",
-#             "credential_type",
-#             "addresses",
-#             "attributes",
-#             "names",
-#             "local_name",
-#             "remote_name",
-#             "topic",
-#             "related_topics",
-#         )
-
-
-# class ExpandedCredentialSetSerializer(CredentialSetSerializer):
-#     credentials = CredentialExtSerializer(many=True)
-
-#     class Meta(CredentialSetSerializer.Meta):
-#         fields = CredentialSetSerializer.Meta.fields + ("credentials",)
-
-
-# class ExpandedCredentialSerializer(CredentialExtSerializer):
-#     credential_set = ExpandedCredentialSetSerializer()
-
-#     class Meta(CredentialExtSerializer.Meta):
-#         fields = CredentialExtSerializer.Meta.fields + ("credential_set",)
diff --git a/server/vcr-server/api/v3/serializers/search.py b/server/vcr-server/api/v3/serializers/search.py
index a320c157a..ec1979255 100644
--- a/server/vcr-server/api/v3/serializers/search.py
+++ b/server/vcr-server/api/v3/serializers/search.py
@@ -1,135 +1,158 @@
 import logging
 
-from rest_framework.serializers import CharField, SerializerMethodField
-from drf_haystack.serializers import (
-    HaystackFacetSerializer,
-    HaystackSerializerMixin,
-    HaystackSerializer,
-)
+from abc import abstractmethod
+
+from rest_framework.serializers import SerializerMethodField
+from drf_haystack.serializers import HaystackSerializer
 
 from ..indexes.Address import AddressIndex
 from ..indexes.Name import NameIndex
 from ..indexes.Topic import TopicIndex
 
-from api.v2.models.Address import Address
-from api.v2.models.Name import Name
-
-from api.v2.serializers.rest import NameSerializer, AddressSerializer, TopicSerializer
+from api.v2.serializers.rest import (
+    AddressSerializer,
+    NameSerializer,
+    TopicSerializer
+)
 
 
 logger = logging.getLogger(__name__)
 
 
-class NameAutocompleteSerializer(HaystackSerializer):
+class AriesSearchSerializer(HaystackSerializer):
 
     type = SerializerMethodField()
+    sub_type = SerializerMethodField()
     value = SerializerMethodField()
-    score = SerializerMethodField()
     topic_source_id = SerializerMethodField()
+    # DEPRECATED
     topic_type = SerializerMethodField()
+    credential_type = SerializerMethodField()
     credential_id = SerializerMethodField()
 
     @staticmethod
+    @abstractmethod
     def get_type(obj):
-        return "name"
+        pass
 
     @staticmethod
-    def get_value(obj):
-        return obj.name_text
+    @abstractmethod
+    def get_sub_type(obj):
+        pass
 
     @staticmethod
-    def get_score(obj):
-        return obj.score
+    @abstractmethod
+    def get_value(obj):
+        pass
 
     @staticmethod
     def get_topic_source_id(obj):
-        return obj._object.credential.topic.source_id
+        return obj.object.credential.topic.source_id
 
+    # DEPRECATED
     @staticmethod
     def get_topic_type(obj):
-        return obj._object.credential.topic.type
+        return obj.object.credential.topic.type
 
     @staticmethod
     def get_credential_id(obj):
-        return obj._object.credential.credential_id
+        return obj.object.credential.credential_id
 
-    class Meta(NameSerializer.Meta):
-        index_classes = [NameIndex]
-        fields = ("type", "value", "score", "topic_source_id", "topic_type", "credential_id")
+    @staticmethod
+    def get_credential_type(obj):
+        return obj.object.credential.credential_type.description
 
+    class Meta:
+        pass
 
-class AddressAutocompleteSerializer(HaystackSerializer):
 
-    type = SerializerMethodField()
-    value = SerializerMethodField()
+class AriesAutocompleteSerializer(AriesSearchSerializer):
     score = SerializerMethodField()
-    topic_source_id = SerializerMethodField()
-    topic_type = SerializerMethodField()
-    credential_id = SerializerMethodField()
+
+    @staticmethod
+    def get_score(obj):
+        return obj.score
+
+
+class NameAutocompleteSerializer(AriesAutocompleteSerializer):
 
     @staticmethod
     def get_type(obj):
-        return "address"
+        return "name"
 
     @staticmethod
-    def get_value(obj):
-        return obj.address_civic_address
+    def get_sub_type(obj):
+        return obj.name_type
 
     @staticmethod
-    def get_score(obj):
-        return obj.score
+    def get_value(obj):
+        return obj.name_text
+
+    class Meta(NameSerializer.Meta):
+        index_classes = [NameIndex]
+        fields = ("type", "sub_type", "value", "score", "topic_source_id",
+                  "topic_type", "credential_id", "credential_type")
+
+
+class AddressAutocompleteSerializer(AriesAutocompleteSerializer):
 
     @staticmethod
-    def get_topic_source_id(obj):
-        return obj._object.credential.topic.source_id
+    def get_type(obj):
+        return "address"
 
     @staticmethod
-    def get_topic_type(obj):
-        return obj._object.credential.topic.type
+    def get_sub_type(obj):
+        return "civic_address"
 
     @staticmethod
-    def get_credential_id(obj):
-        return obj._object.credential.credential_id
+    def get_value(obj):
+        return obj.address_civic_address
 
     class Meta(AddressSerializer.Meta):
         index_classes = [AddressIndex]
-        fields = ("type", "value", "score", "topic_source_id", "topic_type", "credential_id")
+        fields = ("type", "sub_type", "value", "score", "topic_source_id",
+                  "topic_type" "credential_id", "credential_type")
 
 
-class TopicAutocompleteSerializer(HaystackSerializer):
-
-    type = SerializerMethodField()
-    value = SerializerMethodField()
-    score = SerializerMethodField()
-    topic_source_id = SerializerMethodField()
-    topic_type = SerializerMethodField()
+class TopicAutocompleteSerializer(AriesAutocompleteSerializer):
 
     @staticmethod
     def get_type(obj):
         return "topic"
 
     @staticmethod
-    def get_value(obj):
-        return obj.topic_source_id
+    def get_sub_type(obj):
+        return "source_id"
 
     @staticmethod
-    def get_score(obj):
-        return obj.score
+    def get_value(obj):
+        return obj.topic_source_id
 
     @staticmethod
     def get_topic_source_id(obj):
-        return obj._object.source_id
+        return obj.object.source_id
 
+    # DEPRECATED
     @staticmethod
     def get_topic_type(obj):
-        return obj._object.type
+        return obj.object.type
+
+    @staticmethod
+    def get_credential_id(obj):
+        return obj.object.foundational_credential.credential_id
+
+    @staticmethod
+    def get_credential_type(obj):
+        return obj.object.foundational_credential.credential_type.description
 
     class Meta(TopicSerializer.Meta):
         index_classes = [TopicIndex]
-        fields = ("type", "value", "score", "topic_source_id", "topic_type")
+        fields = ("type", "sub_type", "value", "score", "topic_source_id",
+                  "topic_type", "credential_id", "credential_type")
 
 
 class AggregateAutocompleteSerializer(HaystackSerializer):
+
     class Meta:
         serializers = {
             AddressIndex: AddressAutocompleteSerializer,
diff --git a/server/vcr-server/api/v3/urls.py b/server/vcr-server/api/v3/urls.py
index ad459c5b0..4e43ac41f 100644
--- a/server/vcr-server/api/v3/urls.py
+++ b/server/vcr-server/api/v3/urls.py
@@ -28,27 +28,24 @@
 
 router = SimpleRouter(trailing_slash=False)
 
-router.register(r"issuer", rest.IssuerViewSet)
-router.register(r"schema", rest.SchemaViewSet)
-router.register(r"credentialtype", rest.CredentialTypeViewSet)
-router.register(r"credential", rest.CredentialViewSet)
-# router.register(r"topic", rest.TopicViewSet)
+router.register(r"issuer", rest.IssuerViewSet, "Credential Issuer")
+router.register(r"schema", rest.SchemaViewSet, "Credential Schema")
+router.register(r"credentialtype", rest.CredentialTypeViewSet, "Credential Type")
+router.register(r"credential", rest.CredentialViewSet, "Credential")
 
 api_views = [
     path("search/topic/attribute/<attribute_query>", rest.TopicAttributeView.as_view()),
     path("topic/<type>/<source_id>", rest.TopicView.as_view()),
 ]
 
-# router.register(r"topic_relationship", rest.TopicRelationshipViewSet)
-
 # Search endpoints
-router.register(
-    r"search/autocomplete", search.NameAutocompleteView, "Name Autocomplete"
-)
-router.register(r"search/credential", search.CredentialSearchView, "Credential Search")
-router.register(
-    r"search/topic", search.CredentialTopicSearchView, "Credential Topic Search"
-)
+router.register(r"search/autocomplete",
+                search.AggregateAutocompleteView, "Aggregate Autocomplete")
+router.register(r"search/credential",
+                search.CredentialSearchView, "Credential Search")
+# DEPRECATED:
+router.register(r"search/topic",
+                search.CredentialTopicSearchView, "Credential Topic Search")
 
 swaggerPatterns = [
     path("", schema_view.with_ui("swagger", cache_timeout=None), name="api-docs")
diff --git a/server/vcr-server/api/v3/views/rest.py b/server/vcr-server/api/v3/views/rest.py
index 69b9f66eb..1f8edfc58 100644
--- a/server/vcr-server/api/v3/views/rest.py
+++ b/server/vcr-server/api/v3/views/rest.py
@@ -246,7 +246,8 @@ def post_verify(self, request, credential_id, presentation_exchange_id):
                 result["result"]["presentation"] = presentation_state["presentation"]
 
         if result is None:
-            result = {"success": False, "results": "Presentation request response not available."}
+            result = {"success": False,
+                      "results": "Presentation request response not available."}
 
         return JsonResponse(result)
 
@@ -280,13 +281,3 @@ def get_object(self):
         # May raise a permission denied
         self.check_object_permissions(self.request, obj)
         return obj
-
-
-# Add environment specific endpoints
-# try:
-#     # apply_custom_methods(TopicViewSet, "views", "TopicViewSet", "includeMethods")
-#     # apply_custom_methods(
-#     #     TopicRelationshipViewSet, "views", "TopicRelationshipViewSet", "includeMethods"
-#     # )
-# except:
-#     pass
diff --git a/server/vcr-server/api/v3/views/search.py b/server/vcr-server/api/v3/views/search.py
index 0a2427da3..91687ed9a 100644
--- a/server/vcr-server/api/v3/views/search.py
+++ b/server/vcr-server/api/v3/views/search.py
@@ -2,20 +2,23 @@
 
 from django.conf import settings
 from django.http import Http404
-from drf_haystack.filters import HaystackOrderingFilter
-from drf_haystack.mixins import FacetMixin
 
+from rest_framework import permissions
+from rest_framework.decorators import action
+from rest_framework.response import Response
+from rest_framework.exceptions import APIException
 from rest_framework.mixins import ListModelMixin
 from rest_framework.viewsets import ViewSetMixin
+
+from haystack.query import RelatedSearchQuerySet
+
 from drf_haystack.generics import HaystackGenericAPIView
+from drf_haystack.filters import HaystackOrderingFilter, HaystackAutocompleteFilter
+from drf_haystack.mixins import FacetMixin
+from drf_haystack.viewsets import HaystackViewSet
 
 from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema
-from haystack.query import RelatedSearchQuerySet
-from rest_framework import permissions
-from rest_framework.decorators import action
-from rest_framework.response import Response
-from rest_framework.exceptions import APIException
 
 from api.v2.models.Credential import Credential
 from api.v2.models.Name import Name
@@ -27,12 +30,9 @@
     StatusFilter as AutocompleteStatusFilter,
 )
 from api.v3.serializers.search import (
-    NameAutocompleteSerializer,
-    AddressAutocompleteSerializer,
     AggregateAutocompleteSerializer,
 )
 
-
 from api.v2.search.filters import (
     CategoryFilter,
     CredNameFilter,
@@ -47,22 +47,45 @@
     CredentialTopicSearchSerializer,
 )
 
-
 from vcr_server.pagination import ResultLimitPagination
 
+
 LOGGER = logging.getLogger(__name__)
 
 
 class AriesHaystackViewSet(ListModelMixin, ViewSetMixin, HaystackGenericAPIView):
     """
-    AriesHaystackViewSet overrides HaystackViewSet to remove the "RetrieveModeMixin".
+    AriesHaystackViewSet overrides HaystackViewSet to remove the "RetrieveModelMixin".
     The HaystackViewSet class provides the default ``list()`` and
     ``retrieve()`` actions with a haystack index as it's data source.
     """
     pass
 
 
-class NameAutocompleteView(AriesHaystackViewSet):
+aggregate_autocomplete_swagger_params = [
+    openapi.Parameter(
+        "q", openapi.IN_QUERY, description="Query string", type=openapi.TYPE_STRING
+    ),
+    openapi.Parameter(
+        "inactive",
+        openapi.IN_QUERY,
+        description="Show inactive credentials",
+        type=openapi.TYPE_STRING,
+        enum=["false", "true"],
+        default="false",
+    ),
+    openapi.Parameter(
+        "revoked",
+        openapi.IN_QUERY,
+        description="Show revoked credentials",
+        type=openapi.TYPE_STRING,
+        enum=["false", "true"],
+        default="false",
+    ),
+]
+
+
+class AggregateAutocompleteView(AriesHaystackViewSet):
     """
     Return autocomplete results for a query string
     """
@@ -70,34 +93,12 @@ class NameAutocompleteView(AriesHaystackViewSet):
     permission_classes = (permissions.AllowAny,)
     pagination_class = ResultLimitPagination
 
-    _swagger_params = [
-        openapi.Parameter(
-            "q", openapi.IN_QUERY, description="Query string", type=openapi.TYPE_STRING
-        ),
-        openapi.Parameter(
-            "inactive",
-            openapi.IN_QUERY,
-            description="Show inactive credentials",
-            type=openapi.TYPE_STRING,
-            enum=["false", "true"],
-            default=None,
-        ),
-        openapi.Parameter(
-            "revoked",
-            openapi.IN_QUERY,
-            description="Show revoked credentials",
-            type=openapi.TYPE_STRING,
-            enum=["false", "true"],
-            default="false",
-        ),
-    ]
-
     @swagger_auto_schema(
-        manual_parameters=_swagger_params,
+        manual_parameters=aggregate_autocomplete_swagger_params,
         responses={200: AggregateAutocompleteSerializer(many=True)},
     )
     def list(self, *args, **kwargs):
-        ret = super(NameAutocompleteView, self).list(*args, **kwargs)
+        ret = super(AggregateAutocompleteView, self).list(*args, **kwargs)
         return ret
 
     index_models = [Address, Name, Topic]
@@ -113,6 +114,109 @@ class MissingTopicParametersException(APIException):
     default_code = "bad_request"
 
 
+class TopicSearchQuerySet(RelatedSearchQuerySet):
+    """
+    Optimize queries when fetching topic-oriented credential search results
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(TopicSearchQuerySet, self).__init__(*args, **kwargs)
+        self._load_all_querysets[Credential] = self.topic_queryset()
+
+    def __len__(self):
+        ret = super(TopicSearchQuerySet, self).__len__()
+        if ret > LIMIT:
+            ret = LIMIT
+        return ret
+
+    def topic_queryset(self):
+        return Credential.objects.select_related(
+            "credential_type",
+            "credential_type__issuer",
+            "credential_type__schema",
+            "topic",
+        ).all()
+
+    def _fill_cache(self, start, end, **kwargs):
+        if start is not None:
+            if start > LIMIT:
+                start = LIMIT
+        if end is not None:
+            if end > LIMIT:
+                end = LIMIT
+        super(TopicSearchQuerySet, self)._fill_cache(start, end, **kwargs)
+
+    def count(self):
+        ret = super(TopicSearchQuerySet, self).count()
+        if ret > LIMIT:
+            ret = LIMIT
+        return ret
+
+
+credential_search_swagger_params = [
+    openapi.Parameter(
+        "name",
+        openapi.IN_QUERY,
+        description="Filter credentials by related name or Topic Source ID",
+        type=openapi.TYPE_STRING,
+    ),
+    openapi.Parameter(
+        "inactive",
+        openapi.IN_QUERY,
+        description="Show inactive credentials",
+        type=openapi.TYPE_STRING,
+        enum=["any", "false", "true"],
+        default="false",
+    ),
+    openapi.Parameter(
+        "latest",
+        openapi.IN_QUERY,
+        description="Show only latest credentials",
+        type=openapi.TYPE_STRING,
+        enum=["any", "false", "true"],
+        default="true",
+    ),
+    openapi.Parameter(
+        "revoked",
+        openapi.IN_QUERY,
+        description="Show revoked credentials",
+        type=openapi.TYPE_STRING,
+        enum=["any", "false", "true"],
+        default="false",
+    ),
+    openapi.Parameter(
+        "category",
+        openapi.IN_QUERY,
+        description="Filter by Credential Category. The category name and value should be joined by '::'",
+        type=openapi.TYPE_STRING,
+    ),
+    openapi.Parameter(
+        "credential_type_id",
+        openapi.IN_QUERY,
+        description="Filter by Credential Type ID",
+        type=openapi.TYPE_STRING,
+    ),
+    openapi.Parameter(
+        "topic_credential_type_id",
+        openapi.IN_QUERY,
+        description="Filter by any Credential Type ID owned by the Topic",
+        type=openapi.TYPE_STRING,
+    ),
+    openapi.Parameter(
+        "issuer_id",
+        openapi.IN_QUERY,
+        description="Filter by Issuer ID",
+        type=openapi.TYPE_STRING,
+    ),
+    openapi.Parameter(
+        "topic_id",
+        openapi.IN_QUERY,
+        description="Filter by Topic ID",
+        type=openapi.TYPE_STRING,
+    ),
+]
+
+
 class CredentialSearchView(AriesHaystackViewSet, FacetMixin):
     """
     Provide credential search via Solr with both faceted (/facets) and unfaceted results
@@ -120,90 +224,9 @@ class CredentialSearchView(AriesHaystackViewSet, FacetMixin):
 
     permission_classes = (permissions.AllowAny,)
 
-    _swagger_params = [
-        openapi.Parameter(
-            "name",
-            openapi.IN_QUERY,
-            description="Filter credentials by related name or topic source ID",
-            type=openapi.TYPE_STRING,
-        ),
-        openapi.Parameter(
-            "inactive",
-            openapi.IN_QUERY,
-            description="Show inactive credentials",
-            type=openapi.TYPE_STRING,
-            enum=["any", "false", "true"],
-            default="false",
-        ),
-        openapi.Parameter(
-            "latest",
-            openapi.IN_QUERY,
-            description="Show only latest credentials",
-            type=openapi.TYPE_STRING,
-            enum=["any", "false", "true"],
-            default="true",
-        ),
-        openapi.Parameter(
-            "revoked",
-            openapi.IN_QUERY,
-            description="Show revoked credentials",
-            type=openapi.TYPE_STRING,
-            enum=["any", "false", "true"],
-            default="false",
-        ),
-        openapi.Parameter(
-            "category",
-            openapi.IN_QUERY,
-            description="Filter by credential category. The category name and value should be joined by '::'",
-            type=openapi.TYPE_STRING,
-        ),
-        openapi.Parameter(
-            "credential_type_id",
-            openapi.IN_QUERY,
-            description="Filter by Credential Type ID",
-            type=openapi.TYPE_STRING,
-        ),
-        openapi.Parameter(
-            "topic_credential_type_id",
-            openapi.IN_QUERY,
-            description="Filter by any Credential Type ID owned by the Topic",
-            type=openapi.TYPE_STRING,
-        ),
-        openapi.Parameter(
-            "issuer_id",
-            openapi.IN_QUERY,
-            description="Filter by Issuer ID",
-            type=openapi.TYPE_STRING,
-        ),
-        openapi.Parameter(
-            "topic_id",
-            openapi.IN_QUERY,
-            description="Filter by Topic ID",
-            type=openapi.TYPE_STRING,
-        ),
-    ]
-
-    @swagger_auto_schema(manual_parameters=_swagger_params)
+    @swagger_auto_schema(manual_parameters=credential_search_swagger_params)
     def list(self, *args, **kwargs):
-        """
-        Topic search.
-        Requires at minumum 'name' (2 characters or more) or 'topic_id' parameters to be supplied.
-        """
-        if self.object_class is TopicSearchQuerySet:
-            query = self.request.GET.get("name")
-            topic_id = self.request.GET.get("topic_id")
-            if not self.valid_search_query(query, topic_id):
-                raise MissingTopicParametersException()
-        ret = super(CredentialSearchView, self).list(*args, **kwargs)
-        return ret
-
-    def valid_search_query(self, query, topic_id):
-        is_valid = False
-        if isinstance(query, str) and len(query.strip()) >= 2:
-            is_valid = True
-        if isinstance(topic_id, str) and len(topic_id.strip()) > 0:
-            is_valid = True
-        return is_valid
+        return super(CredentialSearchView, self).list(*args, **kwargs)
 
     index_models = [Credential]
     load_all = True
@@ -237,12 +260,6 @@ def facets(self, request):
         facet_queryset = self.filter_facet_queryset(queryset)
         result_queryset = self.filter_queryset(queryset)
 
-        # for facet in request.query_params.getlist(self.facet_query_params_text):
-        # if ":" not in facet:
-        #    continue
-        # field, value = facet.split(":", 1)
-        # if value:
-        #    queryset = queryset.narrow('%s:"%s"' % (field, queryset.query.clean(value)))
         for key in (
             "category",
             "credential_type_id",
@@ -264,48 +281,31 @@ def facets(self, request):
 LIMIT = getattr(settings, "HAYSTACK_MAX_RESULTS", 200)
 
 
-class TopicSearchQuerySet(RelatedSearchQuerySet):
-    """
-    Optimize queries when fetching topic-oriented credential search results
-    """
-
-    def __init__(self, *args, **kwargs):
-        super(TopicSearchQuerySet, self).__init__(*args, **kwargs)
-        self._load_all_querysets[Credential] = self.topic_queryset()
-
-    def __len__(self):
-        ret = super(TopicSearchQuerySet, self).__len__()
-        if ret > LIMIT:
-            ret = LIMIT
-        return ret
-
-    def topic_queryset(self):
-        return Credential.objects.select_related(
-            "credential_type",
-            "credential_type__issuer",
-            "credential_type__schema",
-            "topic",
-        ).all()
-
-    def _fill_cache(self, start, end, **kwargs):
-        if start is not None:
-            if start > LIMIT:
-                start = LIMIT
-        if end is not None:
-            if end > LIMIT:
-                end = LIMIT
-        super(TopicSearchQuerySet, self)._fill_cache(start, end, **kwargs)
+# DEPRECATED:
+class CredentialTopicSearchView(CredentialSearchView):
 
-    def count(self):
-        ret = super(TopicSearchQuerySet, self).count()
-        if ret > LIMIT:
-            ret = LIMIT
+    @swagger_auto_schema(manual_parameters=credential_search_swagger_params)
+    def list(self, *args, **kwargs):
+        """
+        Topic search.
+        Requires at minumum 'name' (2 characters or more) or 'topic_id' parameters to be supplied.
+        """
+        if self.object_class is TopicSearchQuerySet:
+            query = self.request.GET.get("name")
+            topic_id = self.request.GET.get("topic_id")
+            if not self.valid_search_query(query, topic_id):
+                raise MissingTopicParametersException()
+        ret = super(CredentialSearchView, self).list(*args, **kwargs)
         return ret
 
-
-class CredentialTopicSearchView(CredentialSearchView):
+    def valid_search_query(self, query, topic_id):
+        is_valid = False
+        if isinstance(query, str) and len(query.strip()) >= 2:
+            is_valid = True
+        if isinstance(topic_id, str) and len(topic_id.strip()) > 0:
+            is_valid = True
+        return is_valid
 
     object_class = TopicSearchQuerySet
     serializer_class = CredentialTopicSearchSerializer
     facet_objects_serializer_class = CredentialTopicSearchSerializer
-
diff --git a/server/vcr-server/api/v3/views/viewsets.py b/server/vcr-server/api/v3/views/viewsets.py
index 57de17501..e2e4f0091 100644
--- a/server/vcr-server/api/v3/views/viewsets.py
+++ b/server/vcr-server/api/v3/views/viewsets.py
@@ -6,5 +6,4 @@ class RetriveOnlyModelViewSet(mixins.RetrieveModelMixin, GenericViewSet):
     """
     A viewset that provides default `retrieve()` action.
     """
-
     pass
diff --git a/server/vcr-server/api/v4/__init__.py b/server/vcr-server/api/v4/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/server/vcr-server/api/v4/apps.py b/server/vcr-server/api/v4/apps.py
new file mode 100644
index 000000000..dcae604cd
--- /dev/null
+++ b/server/vcr-server/api/v4/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ApiV4Config(AppConfig):
+    name = 'api.v4',
+    label = 'api_v4'
diff --git a/server/vcr-server/api/v4/search/filters/credential.py b/server/vcr-server/api/v4/search/filters/credential.py
new file mode 100644
index 000000000..d7762cdda
--- /dev/null
+++ b/server/vcr-server/api/v4/search/filters/credential.py
@@ -0,0 +1,13 @@
+from haystack.inputs import Clean, Exact, Raw
+
+from api.v2.search.filters import CredNameFilter, CredNameFilterBuilder
+
+
+class CredQueryFilterBuilder(CredNameFilterBuilder):
+
+    query_param = "q"
+
+
+class CredQueryFilter(CredNameFilter):
+
+    query_builder_class = CredQueryFilterBuilder
diff --git a/server/vcr-server/api/v4/search/filters/topic.py b/server/vcr-server/api/v4/search/filters/topic.py
new file mode 100644
index 000000000..99916ad3b
--- /dev/null
+++ b/server/vcr-server/api/v4/search/filters/topic.py
@@ -0,0 +1,73 @@
+from haystack.inputs import Clean, Exact, Raw
+from drf_haystack.query import BaseQueryBuilder
+
+from api.v2.search.filters import (
+    CategoryFilter,
+    CategoryFilterBuilder,
+    ExactFilter,
+    ExactFilterBuilder,
+    StatusFilter,
+    StatusFilterBuilder
+)
+
+from api.v3.search_filters import (
+    AutocompleteFilter,
+    get_autocomplete_builder
+)
+
+filter_display_names = ['category', 'issuer_id',
+                        'type_id', 'credential_type_id', 'inactive', 'revoked']
+
+
+class FilterBuilderBase(BaseQueryBuilder):
+
+    def format_filters(self, **filters):
+        for fname, fval in filters.copy().items():
+            partition = ':'
+            parts = fname.split(partition, 1)
+            if parts[0] in filter_display_names:
+                filters['topic_' + partition.join(parts)] = fval
+                del filters[fname]
+        return filters
+
+
+class TopicCategoryFilterBuilder(FilterBuilderBase, CategoryFilterBuilder):
+
+    query_param = 'topic_category'
+
+    def build_query(self, **filters):
+        return super(TopicCategoryFilterBuilder, self).build_query(**self.format_filters(**filters))
+
+
+class TopicExactFilterBuilder(FilterBuilderBase, ExactFilterBuilder):
+
+    def build_query(self, **filters):
+        return super(TopicExactFilterBuilder, self).build_query(**self.format_filters(**filters))
+
+
+class TopicStatusFilterBuilder(FilterBuilderBase, StatusFilterBuilder):
+
+    def build_query(self, **filters):
+        return super(TopicStatusFilterBuilder, self).build_query(**self.format_filters(**filters))
+
+
+class TopicCategoryFilter(CategoryFilter):
+
+    query_builder_class = TopicCategoryFilterBuilder
+
+
+class TopicExactFilter(ExactFilter):
+
+    query_builder_class = TopicExactFilterBuilder
+
+
+class TopicStatusFilter(StatusFilter):
+
+    query_builder_class = TopicStatusFilterBuilder
+
+
+class TopicQueryFilter(AutocompleteFilter):
+
+    query_builder_class = get_autocomplete_builder(
+        ('topic_source_id', 'topic_name', 'topic_address')
+    )
diff --git a/server/vcr-server/api/v4/serializers/search/topic.py b/server/vcr-server/api/v4/serializers/search/topic.py
new file mode 100644
index 000000000..144ce4d12
--- /dev/null
+++ b/server/vcr-server/api/v4/serializers/search/topic.py
@@ -0,0 +1,149 @@
+import logging
+from collections import OrderedDict
+
+from rest_framework.serializers import BooleanField, CharField, DateTimeField, IntegerField, SerializerMethodField
+from drf_haystack.serializers import HaystackSerializer, HaystackFacetSerializer
+
+from api.v2.models.Address import Address
+from api.v2.models.Credential import Credential
+from api.v2.models.CredentialType import CredentialType
+from api.v2.models.Issuer import Issuer
+from api.v2.models.Name import Name
+from api.v2.models.Topic import Topic
+
+from api.v2.serializers.rest import (
+    AddressSerializer,
+    CredentialSerializer,
+    CredentialSetSerializer,
+    CredentialTypeSerializer,
+    NameSerializer,
+    TopicSerializer,
+    TopicAttributeSerializer,
+)
+from api.v2.serializers.search import (
+    CredentialFacetSerializer,
+)
+
+from api.v3.indexes.Topic import TopicIndex
+
+
+facet_filter_display_map = {
+    'topic_category': 'category',
+    'topic_issuer_id': 'issuer_id',
+    'topic_type_id': 'type_id',
+    'topic_credential_type_id': 'credential_type_id',
+}
+
+
+class TopicNameSerializer(NameSerializer):
+
+    credential_id = SerializerMethodField()
+
+    @staticmethod
+    def get_credential_id(obj):
+        return obj.credential.id
+
+    class Meta(NameSerializer.Meta):
+        fields = ("id", "text", "language", "type", "credential_id")
+
+
+class TopicAddressSerializer(AddressSerializer):
+
+    credential_id = SerializerMethodField()
+
+    @staticmethod
+    def get_credential_id(obj):
+        return obj.credential.id
+
+    class Meta(AddressSerializer.Meta):
+        fields = ("id", "addressee", "civic_address", "city",
+                  "province", "postal_code", "country", "credential_id")
+
+
+class SearchSerializer(HaystackSerializer):
+    id = IntegerField(source="object.id")
+    source_id = CharField(source="object.source_id")
+    type = CharField(source="object.type")
+    names = TopicNameSerializer(
+        source="object.get_active_names", many=True)
+    addresses = TopicAddressSerializer(
+        source="object.get_active_addresses", many=True)
+    attributes = TopicAttributeSerializer(
+        source="object.get_active_attributes", many=True)
+    credential_set = CredentialSetSerializer(
+        source="object.foundational_credential.credential_set")
+    credential_type = CredentialTypeSerializer(
+        source="object.foundational_credential.credential_type")
+    inactive = BooleanField(
+        source="object.foundational_credential.inactive")
+    revoked = BooleanField(
+        source="object.foundational_credential.revoked")
+    effective_date = DateTimeField(
+        source="object.foundational_credential.effective_date")
+    revoked_date = DateTimeField(
+        source="object.foundational_credential.revoked_date")
+
+    class Meta:
+        index_classes = [TopicIndex]
+        fields = ("id", "source_id", "type", "names", "addresses", "attributes", "credential_set",
+                  "credential_type", "inactive", "revoked", "effective_date", "revoked_date")
+        # ExactFilter fields
+        exact_fields = ("topic_issuer_id", "topic_type_id", "topic_credential_type_id")
+        # StatusFilter fields
+        status_fields = {"topic_inactive": "false", "topic_revoked": "false"}
+        # HaystackFilter fields
+        search_fields = ("score")
+
+
+class FacetSerializer(CredentialFacetSerializer):
+
+    def get_facets(self, instance):
+        result = OrderedDict()
+        for facet_type, facet_data in instance.items():
+            serial_data = {}
+            for field, facets in facet_data.items():
+                if field in facet_filter_display_map:
+                    field = facet_filter_display_map[field]
+                serial_data[field] = self.format_facets(field, facets)
+            result[facet_type] = serial_data
+        return result
+
+    def format_facets(self, field_name, facets):
+        field_memo = self.format_facet_text(field_name, facets)
+        return [self.format_facet_field(field_name, facet, field_memo) for facet in facets]
+
+    def format_facet_text(self, field_name, facets):
+        values = [facet[0] for facet in facets]
+        Model, field_selector, text = None, "", {}
+        if field_name == "issuer_id":
+            Model, field_selector = Issuer, "name"
+        elif field_name == "type_id" or field_name == "credential_type_id":
+            Model, field_selector = CredentialType, "description"
+
+        if Model and field_selector:
+            rows = Model.objects.filter(pk__in=values)
+            if len(rows):
+                text = {
+                    field_name: {
+                        str(row['id']): row[field_selector] for row in rows.values()
+                    }
+                }
+
+        return text
+
+    def format_facet_field(self, field_name, facet, field_memo):
+        text, value, count = None, facet[0], facet[1]
+        if field_name in field_memo and value in field_memo[field_name]:
+            text = field_memo[field_name][value]
+        return {"value": value, "count": count, "text": text}
+
+    class Meta:
+        index_classes = [TopicIndex]
+        fields = ("topic_category", "topic_issuer_id",
+                  "topic_type_id", "topic_credential_type_id")
+        field_options = {
+            "topic_category": {},
+            "topic_issuer_id": {},
+            "topic_type_id": {},
+            "topic_credential_type_id": {}
+        }
diff --git a/server/vcr-server/api/v4/tests.py b/server/vcr-server/api/v4/tests.py
new file mode 100644
index 000000000..7ce503c2d
--- /dev/null
+++ b/server/vcr-server/api/v4/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/server/vcr-server/api/v4/urls.py b/server/vcr-server/api/v4/urls.py
new file mode 100644
index 000000000..8380b97d2
--- /dev/null
+++ b/server/vcr-server/api/v4/urls.py
@@ -0,0 +1,38 @@
+from django.conf import settings
+from django.urls import path
+from drf_yasg import openapi
+from drf_yasg.views import get_schema_view
+from rest_framework.permissions import AllowAny
+from rest_framework.routers import SimpleRouter
+from rest_framework.urlpatterns import format_suffix_patterns
+
+from api.v4.views.search import topic, credential
+
+
+app_name = "api_v4"
+
+API_METADATA = settings.API_METADATA
+schema_view = get_schema_view(
+    openapi.Info(
+        title=API_METADATA["title"],
+        default_version="v4",
+        description=API_METADATA["description"],
+        terms_of_service=API_METADATA["terms"]["url"],
+        contact=openapi.Contact(**API_METADATA["contact"]),
+        license=openapi.License(**API_METADATA["license"]),
+    ),
+    validators=["flex", "ssv"],
+    public=True,
+    permission_classes=(AllowAny,),
+)
+
+router = SimpleRouter(trailing_slash=False)
+
+router.register(r"search/credential", credential.SearchView, "Credential Search")
+router.register(r"search/topic", topic.SearchView, "Topic Search")
+
+swaggerPatterns = [
+    path("", schema_view.with_ui("swagger", cache_timeout=None), name="api-docs")
+]
+
+urlpatterns = format_suffix_patterns(router.urls) + swaggerPatterns
diff --git a/server/vcr-server/api/v4/views/search/credential.py b/server/vcr-server/api/v4/views/search/credential.py
new file mode 100644
index 000000000..f643eb279
--- /dev/null
+++ b/server/vcr-server/api/v4/views/search/credential.py
@@ -0,0 +1,63 @@
+from drf_yasg import openapi
+from drf_yasg.utils import swagger_auto_schema
+
+from drf_haystack.filters import HaystackOrderingFilter
+
+from api.v2.search.filters import (
+    CategoryFilter,
+    CustomFacetFilter,
+    ExactFilter,
+    StatusFilter,
+)
+
+from api.v3.views.search import (
+    CredentialSearchView,
+    credential_search_swagger_params as swagger_params,
+)
+
+from api.v4.search.filters.credential import CredQueryFilter
+
+_deprecated_params = ('name',)
+_swagger_params = [
+    # Put additional parameters here
+    openapi.Parameter(
+        "q",
+        openapi.IN_QUERY,
+        description="Filter credentials by related name, address or Topic Source ID",
+        type=openapi.TYPE_STRING,
+    ),
+    openapi.Parameter(
+        "ordering",
+        openapi.IN_QUERY,
+        description="Which field to use when ordering the results ('effective_date', 'revoked_date', 'score').",
+        type=openapi.TYPE_STRING,
+        default="-score",
+    ),
+] + list(filter(lambda param: param.name not in _deprecated_params, swagger_params))
+
+
+class SearchView(CredentialSearchView):
+    """
+    Provide Credential search via Solr with both faceted (/facets) and unfaceted results
+    """
+
+    # Backends need to be added in the order of filter operations to be applied
+    filter_backends = [
+        CredQueryFilter,
+        CategoryFilter,
+        ExactFilter,
+        StatusFilter,
+        HaystackOrderingFilter,
+    ]
+
+    # Backends need to be added in the order of filter operations to be applied
+    facet_filter_backends = [
+        CredQueryFilter,
+        ExactFilter,
+        StatusFilter,
+        CustomFacetFilter,
+    ]
+
+    @swagger_auto_schema(manual_parameters=_swagger_params)
+    def list(self, *args, **kwargs):
+        return super(SearchView, self).list(*args, **kwargs)
diff --git a/server/vcr-server/api/v4/views/search/topic.py b/server/vcr-server/api/v4/views/search/topic.py
new file mode 100644
index 000000000..1119f4b99
--- /dev/null
+++ b/server/vcr-server/api/v4/views/search/topic.py
@@ -0,0 +1,139 @@
+from rest_framework import permissions
+from rest_framework.decorators import action
+from rest_framework.response import Response
+
+from drf_yasg import openapi
+from drf_yasg.utils import swagger_auto_schema
+
+from drf_haystack.mixins import FacetMixin
+from drf_haystack.filters import HaystackOrderingFilter
+
+from api.v2.search.filters import (
+    CategoryFilter,
+    CustomFacetFilter,
+    ExactFilter,
+    StatusFilter,
+)
+
+from api.v2.models.Topic import Topic
+
+from api.v3.views.search import (
+    AriesHaystackViewSet,
+    credential_search_swagger_params as swagger_params,
+)
+
+from api.v4.search.filters.topic import (
+    TopicCategoryFilter,
+    TopicExactFilter,
+    TopicQueryFilter,
+    TopicStatusFilter,
+    filter_display_names
+)
+
+from api.v4.serializers.search.topic import SearchSerializer, FacetSerializer
+
+_deprecated_params = ('name', 'topic_id', 'credential_type_id',
+                      'topic_credential_type_id')
+_swagger_params = [
+    # Put additional parameters here
+    openapi.Parameter(
+        "q",
+        openapi.IN_QUERY,
+        description="Filter topics by related name, address or Topic Source ID",
+        type=openapi.TYPE_STRING,
+    ),
+    openapi.Parameter(
+        "ordering",
+        openapi.IN_QUERY,
+        description="Which field to use when ordering the results ('effective_date', 'revoked_date', 'score').",
+        type=openapi.TYPE_STRING,
+        default="-score",
+    ),
+] + list(filter(lambda param: param.name not in _deprecated_params, swagger_params)) + [
+    openapi.Parameter(
+        "type_id",
+        openapi.IN_QUERY,
+        description="Filter by Credential Type ID of the Topic",
+        type=openapi.TYPE_STRING,
+    ),
+    openapi.Parameter(
+        "credential_type_id",
+        openapi.IN_QUERY,
+        description="Filter by Credential Type ID of any credentials owned by the Topic",
+        type=openapi.TYPE_STRING,
+    ),
+]
+
+
+class SearchView(AriesHaystackViewSet, FacetMixin):
+    """
+    Provide Topic search via Solr with both faceted (/facets) and unfaceted results
+    """
+
+    permission_classes = (permissions.AllowAny,)
+
+    index_models = [Topic]
+    serializer_class = SearchSerializer
+    facet_serializer_class = FacetSerializer
+    facet_objects_serializer_class = SearchSerializer
+    ordering_fields = ("effective_date", "revoked_date", "score")
+    ordering = "-score"
+
+    # Backends need to be added in the order of filter operations to be applied
+    filter_backends = [
+        TopicQueryFilter,
+        TopicCategoryFilter,
+        TopicExactFilter,
+        TopicStatusFilter,
+        HaystackOrderingFilter,
+    ]
+
+    # Backends need to be added in the order of filter operations to be applied
+    facet_filter_backends = [
+        TopicQueryFilter,
+        TopicExactFilter,
+        TopicStatusFilter,
+        CustomFacetFilter,
+    ]
+
+    @swagger_auto_schema(manual_parameters=_swagger_params)
+    def list(self, *args, **kwargs):
+        return super(SearchView, self).list(*args, **kwargs)
+
+    # FacetMixin provides /facets
+    @action(detail=False, methods=["get"], url_path="facets")
+    def facets(self, request):
+        queryset = self.get_queryset()
+        facet_queryset = self.filter_facet_queryset(queryset)
+        result_queryset = self.filter_queryset(queryset)
+
+        narrow_dict = {}
+        for key in filter_display_names:
+            # We dont want to restrict the facets by status
+            if key in ('inactive', 'revoked'):
+                continue
+            for value in request.query_params.getlist(key):
+                if value:
+                    narrow_dict['topic_'
+                                + key] = queryset.query.clean(value)
+
+        for query_param in request.query_params:
+            # For category query parameters of the form category:<category_name>=<category_value>
+            if ':' not in query_param:
+                continue
+            key, category = query_param.split(":", 1)
+            if not key or not category or (key not in filter_display_names):
+                continue
+            for value in request.query_params.getlist(query_param):
+                if value:
+                    narrow_dict['topic_'
+                                + key] = queryset.query.clean('{}::{}'.format(category, value))
+
+        for key, value in narrow_dict.items():
+            facet_queryset = facet_queryset.narrow('{}:{}'.format(key, value))
+
+        serializer = self.get_facet_serializer(
+            facet_queryset.facet_counts(), objects=result_queryset, many=False
+        )
+
+        return Response(serializer.data)
diff --git a/server/vcr-server/vcr_server/settings.py b/server/vcr-server/vcr_server/settings.py
index b4f54bd34..079a3f244 100644
--- a/server/vcr-server/vcr_server/settings.py
+++ b/server/vcr-server/vcr_server/settings.py
@@ -71,6 +71,7 @@ def parse_bool(val):
     "vcr_server",
     "api.v2",
     "api.v3",
+    "api.v4",
     "corsheaders",
     "rest_hooks",  # only required when using webhook subscriptions
     "subscriptions",  # only required when using webhook subscriptions
@@ -397,6 +398,8 @@ def parse_bool(val):
 HTTP_HEADER_ROUTING_MIDDLEWARE_VERSION_MAP = {
     u"v2": u"v2",
     u"v3": u"v3",
+    u"v4": u"v4",
+    u"alpha": u"v4",
     u"latest": u"v3",
     u"default": u"v2",
 }
diff --git a/server/vcr-server/vcr_server/urls.py b/server/vcr-server/vcr_server/urls.py
index 1e5861d7a..d24d05805 100644
--- a/server/vcr-server/vcr_server/urls.py
+++ b/server/vcr-server/vcr_server/urls.py
@@ -37,6 +37,7 @@
     path("api", RedirectView.as_view(url="api/"), name="api"),
     path("api/v2/", include("api.v2.urls", namespace="v2"), name="api-v2"),
     path("api/v3/", include("api.v3.urls", namespace="v3"), name="api-v3"),
+    path("api/v4/", include("api.v4.urls", namespace="v4"), name="api-v4"),
 ]
 
 urlpatterns = base_patterns + hook_patterns + api_patterns