diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/MetadataResolverConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/MetadataResolverConfiguration.java
index ef8e4dae4..f6a88b27d 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/MetadataResolverConfiguration.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/MetadataResolverConfiguration.java
@@ -4,6 +4,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
+import org.apache.http.HttpResponse;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
@@ -13,6 +14,7 @@
 import org.joda.time.DateTime;
 import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver;
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
+import org.opensaml.saml.metadata.resolver.filter.MetadataFilterChain;
 import org.opensaml.saml.metadata.resolver.impl.FileBackedHTTPMetadataResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,16 +73,25 @@ protected void initMetadataResolver() throws ComponentInitializationException {
                 }
             }
 
+            // TODO: this is probably not the best way to do this
             @Nullable
             @Override
             public DateTime getLastRefresh() {
                 return null;
             }
+
+            // TODO: this is probably not the best way to do this
+            @Override
+            protected void processConditionalRetrievalHeaders(HttpResponse response) {
+                // let's do nothing 'cause we want to allow a refresh
+            }
         };
         incommonMR.setId("incommonmd");
         incommonMR.setParserPool(openSamlObjects.getParserPool());
+        incommonMR.setMetadataFilter(new MetadataFilterChain());
         incommonMR.initialize();
 
+
         resolvers.add(incommonMR);
 
         if (!metadataResolverRepository.findAll().iterator().hasNext()) {
diff --git a/ui/src/app/dashboard/container/dashboard.component.html b/ui/src/app/dashboard/container/dashboard.component.html
index d72a179a3..69780c0e3 100644
--- a/ui/src/app/dashboard/container/dashboard.component.html
+++ b/ui/src/app/dashboard/container/dashboard.component.html
@@ -47,7 +47,7 @@
                 <li *ngFor="let entity of limited$ | async; index as i" [ngClass]="{'mt-2': i > 0}" aria-label="Provider Item Accordion. Press Spacebar to open">
                     <entity-item
                         [entity]="entity"
-                        [isOpen]="(entitiesOpen$ | async)[entity.entityId]"
+                        [isOpen]="(entitiesOpen$ | async)[entity.id || entity.entityId]"
                         (select)="edit(entity)"
                         (toggle)="toggleProvider(entity)"
                         (preview)="openPreviewDialog(entity)"
diff --git a/ui/src/app/dashboard/container/dashboard.component.ts b/ui/src/app/dashboard/container/dashboard.component.ts
index 8ac942f96..79a0c8525 100644
--- a/ui/src/app/dashboard/container/dashboard.component.ts
+++ b/ui/src/app/dashboard/container/dashboard.component.ts
@@ -88,7 +88,8 @@ export class DashboardComponent implements OnInit {
     }
 
     toggleProvider(entity: MetadataEntity): void {
-        this.store.dispatch(new ToggleEntityDisplay(entity.entityId));
+        let id = entity.id ? entity.id : entity.entityId;
+        this.store.dispatch(new ToggleEntityDisplay(id));
     }
 
     openPreviewDialog(entity: MetadataEntity): void {
diff --git a/ui/src/app/metadata-filter/action/filter.action.ts b/ui/src/app/metadata-filter/action/filter.action.ts
index 93e00d64a..af0f6f4c0 100644
--- a/ui/src/app/metadata-filter/action/filter.action.ts
+++ b/ui/src/app/metadata-filter/action/filter.action.ts
@@ -6,7 +6,6 @@ import { MDUI } from '../../domain/model/mdui';
 
 export const SELECT_ID = '[Filter] Select Entity ID';
 
-export const CREATE_FILTER = '[Filter] Create Filter';
 export const UPDATE_FILTER = '[Filter] Update Filter';
 export const CANCEL_CREATE_FILTER = '[Filter] Cancel Create Filter';
 
@@ -36,12 +35,6 @@ export class LoadEntityPreviewError implements Action {
     constructor(public payload: string) { }
 }
 
-export class CreateFilter implements Action {
-    readonly type = CREATE_FILTER;
-
-    constructor(public payload: MetadataFilter) { }
-}
-
 export class CancelCreateFilter implements Action {
     readonly type = CANCEL_CREATE_FILTER;
 }
@@ -54,7 +47,6 @@ export class UpdateFilterChanges implements Action {
 
 export type Actions =
     | SelectId
-    | CreateFilter
     | UpdateFilterChanges
     | CancelCreateFilter
     | LoadEntityPreview
diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.html b/ui/src/app/metadata-filter/container/edit-filter.component.html
index 7c9a4edaa..dd7ba29f7 100644
--- a/ui/src/app/metadata-filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata-filter/container/edit-filter.component.html
@@ -105,7 +105,7 @@
                             <ng-container i18n="@@action--save-changes">Preview XML</ng-container>
                         </button>
                         <button
-                            (click)="this.save()"
+                            (click)="this.save($event)"
                             type="submit"
                             class="btn btn-primary"
                             [disabled]="form.invalid || (isSaving$ | async)">
diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.ts b/ui/src/app/metadata-filter/container/edit-filter.component.ts
index f3bc80385..f999fecb0 100644
--- a/ui/src/app/metadata-filter/container/edit-filter.component.ts
+++ b/ui/src/app/metadata-filter/container/edit-filter.component.ts
@@ -12,7 +12,7 @@ import * as fromFilter from '../reducer';
 import * as fromCollection from '../../domain/reducer';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { CancelCreateFilter, SelectId, CreateFilter, UpdateFilterChanges } from '../action/filter.action';
+import { CancelCreateFilter, SelectId, UpdateFilterChanges } from '../action/filter.action';
 import { AddFilterRequest, UpdateFilterRequest } from '../../domain/action/filter-collection.action';
 import { MetadataFilter } from '../../domain/model/metadata-filter';
 import { Filter } from '../../domain/entity/filter';
@@ -50,7 +50,10 @@ export class EditFilterComponent implements OnInit, OnDestroy {
     isSaving$: Observable<boolean>;
 
     form: FormGroup = this.fb.group({
-        entityId: ['', [Validators.required]],
+        entityId: [
+            '',
+            [Validators.required]
+        ],
         filterName: ['', [Validators.required]],
         filterEnabled: [false]
     });
@@ -81,23 +84,23 @@ export class EditFilterComponent implements OnInit, OnDestroy {
 
         this.entityIds$.subscribe(ids => this.ids = ids);
 
-        this.filter$.subscribe(filter => {
-            let { entityId, filterName, filterEnabled } = new Filter(filter);
-            this.form.reset({
-                entityId,
-                filterName,
-                filterEnabled
-            });
-            this.filter = filter;
-            this.filterEntity = new Filter(filter);
+        this.filter$
+            .withLatestFrom(this.isSaving$)
+            .subscribe(([filter, saving]) => {
+                let { entityId, filterName, filterEnabled } = new Filter(filter);
+                this.form.reset({
+                    entityId,
+                    filterName,
+                    filterEnabled
+                });
+                this.filter = filter;
+                this.filterEntity = new Filter(filter);
 
-            this.store.dispatch(new SelectId(entityId));
-        });
+                this.store.dispatch(new SelectId(entityId));
+            });
     }
 
     ngOnInit(): void {
-        this.store.dispatch(new ClearSearch());
-
         let id = this.form.get('entityId');
         id.valueChanges
             .distinctUntilChanged()
@@ -116,14 +119,19 @@ export class EditFilterComponent implements OnInit, OnDestroy {
 
         this.form.get('entityId').disable();
 
-        id
-        .valueChanges
-        .distinctUntilChanged()
-        .subscribe(entityId => {
-            if (id.valid) {
-                this.store.dispatch(new SelectId(entityId));
-            }
-        });
+        id.valueChanges
+            .distinctUntilChanged()
+            .subscribe(entityId => {
+                if (id.valid) {
+                    this.store.dispatch(new SelectId(entityId));
+                }
+            });
+
+        this.selected$
+            .distinctUntilChanged()
+            .subscribe(entityId => {
+                id.setValue(entityId);
+            });
     }
 
     ngOnDestroy(): void {
@@ -163,7 +171,8 @@ export class EditFilterComponent implements OnInit, OnDestroy {
         this.isValid = status === 'VALID';
     }
 
-    save(): void {
+    save($event): void {
+        $event.preventDefault();
         this.store.dispatch(new UpdateFilterRequest({...this.filter, ...this.changes.serialize()}));
     }
 
diff --git a/ui/src/app/metadata-filter/container/new-filter.component.ts b/ui/src/app/metadata-filter/container/new-filter.component.ts
index f83ad5efd..3b77bad66 100644
--- a/ui/src/app/metadata-filter/container/new-filter.component.ts
+++ b/ui/src/app/metadata-filter/container/new-filter.component.ts
@@ -11,7 +11,7 @@ import 'rxjs/add/observable/fromPromise';
 import * as fromFilter from '../reducer';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { CancelCreateFilter, SelectId, CreateFilter, UpdateFilterChanges } from '../action/filter.action';
+import { CancelCreateFilter, SelectId, UpdateFilterChanges } from '../action/filter.action';
 import { AddFilterRequest } from '../../domain/action/filter-collection.action';
 import { MetadataFilter } from '../../domain/model/metadata-filter';
 import { Filter } from '../../domain/entity/filter';
@@ -71,6 +71,7 @@ export class NewFilterComponent implements OnInit, OnDestroy {
         private valueEmitter: ProviderValueEmitter,
         private fb: FormBuilder
     ) {
+        this.store.dispatch(new ClearSearch());
         this.changes$ = this.store.select(fromFilter.getFilter);
         this.changes$.subscribe(c => this.changes = new Filter(c));
 
@@ -86,8 +87,6 @@ export class NewFilterComponent implements OnInit, OnDestroy {
     }
 
     ngOnInit(): void {
-        this.store.dispatch(new ClearSearch());
-
         let id = this.form.get('entityId');
         id.valueChanges
             .distinctUntilChanged()
@@ -104,21 +103,19 @@ export class NewFilterComponent implements OnInit, OnDestroy {
             .startWith(this.form.value)
             .subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes)));
 
-        /*this.statusEmitSubscription = this.form
-            .statusChanges
-            .takeUntil(this.ngUnsubscribe)
-            .startWith(this.form.status)
-            .subscribe(status => this.onStatusChange.emit(status));*/
-
-
-            id
-            .valueChanges
+        id.valueChanges
             .distinctUntilChanged()
             .subscribe(entityId => {
                 if (id.valid) {
                     this.store.dispatch(new SelectId(entityId));
                 }
             });
+        this.selected$
+            .distinctUntilChanged()
+            .subscribe(entityId => {
+                console.log(entityId);
+                id.setValue(entityId);
+            });
     }
 
     ngOnDestroy(): void {
@@ -127,7 +124,7 @@ export class NewFilterComponent implements OnInit, OnDestroy {
     }
 
     searchEntityIds(term: string): void {
-        if (term.length >= 4 && this.ids.indexOf(term) < 0) {
+        if (term && term.length >= 4 && this.ids.indexOf(term) < 0) {
             this.store.dispatch(new QueryEntityIds({
                 term,
                 limit: 10
diff --git a/ui/src/app/metadata-filter/reducer/filter.reducer.ts b/ui/src/app/metadata-filter/reducer/filter.reducer.ts
index 4b36bff38..58e7b0e2b 100644
--- a/ui/src/app/metadata-filter/reducer/filter.reducer.ts
+++ b/ui/src/app/metadata-filter/reducer/filter.reducer.ts
@@ -1,9 +1,11 @@
 import { createSelector, createFeatureSelector } from '@ngrx/store';
 import * as filter from '../action/filter.action';
+import * as search from '../action/search.action';
 import * as collection from '../../domain/action/filter-collection.action';
 import { FilterCollectionActionTypes, FilterCollectionActionsUnion } from '../../domain/action/filter-collection.action';
 import * as fromRoot from '../../core/reducer';
 import { MetadataFilter, MDUI } from '../../domain/domain.type';
+import { SearchAction } from '../../dashboard/action/search.action';
 
 export interface FilterState {
     selected: string | null;
@@ -19,7 +21,7 @@ export const initialState: FilterState = {
     saving: false
 };
 
-export function reducer(state = initialState, action: filter.Actions | FilterCollectionActionsUnion): FilterState {
+export function reducer(state = initialState, action: filter.Actions | search.Actions | FilterCollectionActionsUnion): FilterState {
     switch (action.type) {
         case filter.SELECT_ID: {
             return {
@@ -33,12 +35,6 @@ export function reducer(state = initialState, action: filter.Actions | FilterCol
                 preview: action.payload
             };
         }
-        case filter.CREATE_FILTER: {
-            return {
-                ...state,
-                changes: action.payload
-            };
-        }
         case filter.UPDATE_FILTER: {
             return {
                 ...state,
@@ -51,12 +47,13 @@ export function reducer(state = initialState, action: filter.Actions | FilterCol
         case FilterCollectionActionTypes.ADD_FILTER:
         case FilterCollectionActionTypes.UPDATE_FILTER_REQUEST: {
             return {
-                ...initialState,
+                ...state,
                 saving: true
             };
         }
         case FilterCollectionActionTypes.ADD_FILTER_SUCCESS:
         case FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS:
+        case search.CLEAR_SEARCH:
         case filter.CANCEL_CREATE_FILTER: {
             return {
                 ...initialState