diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java
index 7c26adc4d..a30610415 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlMetadataResolverDelegate.java
@@ -38,6 +38,7 @@ void addIndexedDescriptorsFromBackingStore(AbstractMetadataResolver.EntityBackin
                 document.add(new StringField("tag", resourceId, Field.Store.YES));
                 indexWriter.addDocument(document);
             }
+            indexWriter.commit();
         } catch (IOException e) {
             logger.error(e.getMessage(), e);
             throw new ComponentInitializationException(e);
diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard.component.html b/ui/src/app/metadata/resolver/container/resolver-wizard.component.html
index 1163fe889..b9a6a75d7 100644
--- a/ui/src/app/metadata/resolver/container/resolver-wizard.component.html
+++ b/ui/src/app/metadata/resolver/container/resolver-wizard.component.html
@@ -1,10 +1,12 @@
 <wizard (onNext)="next()" (onPrevious)="previous()" (onSave)="save()"></wizard>
 <hr />
 <div class="py-4">
-    <router-outlet></router-outlet>
+        <div class="col-11">
+            <router-outlet></router-outlet>
+        </div>
 </div>
 <wizard-summary
     [summary]="summary$ | async"
     (onPageSelect)="gotoPage($event)"
     *ngIf="currentPage === 'summary'">
-</wizard-summary>
\ No newline at end of file
+</wizard-summary>
diff --git a/ui/src/app/shared/component/info-icon.component.html b/ui/src/app/shared/component/info-icon.component.html
index 38dee05bd..f73d5e0eb 100644
--- a/ui/src/app/shared/component/info-icon.component.html
+++ b/ui/src/app/shared/component/info-icon.component.html
@@ -8,7 +8,8 @@
     [triggers]="triggers"
     [placement]="placement"
     [attr.aria-flowto]="id"
-    role="tooltip">
+    role="tooltip"
+    container="body">
     <i class="fa fa-fw fa-info-circle text-primary fa-lg"></i>
     <span class="sr-only" translate="tooltip.instruction"></span>
 </button>
diff --git a/ui/src/app/shared/component/info-icon.component.scss b/ui/src/app/shared/component/info-icon.component.scss
index e42aa999e..87b013155 100644
--- a/ui/src/app/shared/component/info-icon.component.scss
+++ b/ui/src/app/shared/component/info-icon.component.scss
@@ -6,8 +6,6 @@
         border: none;
         display: inline;
     }
+}
+
 
-    .popover .popover-body {
-        min-width: 160px;
-    }
-}
\ No newline at end of file
diff --git a/ui/src/app/shared/component/info-icon.component.ts b/ui/src/app/shared/component/info-icon.component.ts
index 5c340b410..84ac09d0a 100644
--- a/ui/src/app/shared/component/info-icon.component.ts
+++ b/ui/src/app/shared/component/info-icon.component.ts
@@ -12,7 +12,8 @@ export class InfoIconComponent {
 
     id: string = String.fromCharCode(65 + Math.floor(Math.random() * 26)) + Date.now().toString();
 
-    triggers = 'mouseenter:mouseleave focus:blur';
+    // triggers = 'mouseenter:mouseleave focus:blur';
+    triggers = 'click';
     container = 'body';
     placement = ['top'];