diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs
index f800e9d53..5f5b54838 100644
--- a/ui/admin/app/components/form/host-set/aws/index.hbs
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -6,7 +6,7 @@
   @showEditToggle={{if @model.isNew false true}}
   as |form|
 >
-
+  
   <form.input
     @name='name'
     @type='name'
@@ -80,6 +80,90 @@
   <Rose::Form::Fieldset>
     <:title>{{t 'form.provider.filter.label'}}</:title>
     <:description>{{t 'form.provider.filter.help'}}</:description>
+    <:body>
+      {{#if @model.errors.filters}}
+        <Rose::Form::Errors as |errors|>
+          {{#each @model.errors.filters as |error|}}
+            <errors.message>{{error.message}}</errors.message>
+          {{/each}}
+        </Rose::Form::Errors>
+      {{/if}}
+      <Rose::Table @style='condensed' as |table|>
+        <table.header as |header|>
+          <header.row @hidden={{true}} as |row|>
+            <row.headerCell>{{t 'titles.value'}}</row.headerCell>
+            <row.headerCell />
+          </header.row>
+        </table.header>
+        <table.body as |body|>
+           {{#each @model.filters as |filter i|}}
+            <body.row as |row|>  
+            <row.cell>
+                <form.input
+                  @type='text'
+                  @value={{filter.value}}
+                  @error={{@model.errors.filters}}
+                  @contextual={{true}}
+                  as |field|
+                >
+                  <field.label>FIELDD</field.label>
+                  <field.field />
+                </form.input>
+              </row.cell> 
+              <row.cell @shrink={{true}}>
+                <Rose::Button
+                  @style='warning'
+                  @iconOnly='flight-icons/svg/trash-16'
+                  title={{t 'actions.remove'}}
+                  @disabled={{if
+                    @model.isNew
+                    false
+                    (if form.isEditable false true)
+                  }}
+                  {{on
+                    'click'
+                    (fn @removeItemByIndex 'filters' i)
+                  }}
+                >
+                  {{t 'actions.remove'}}
+                </Rose::Button>
+              </row.cell>  
+             </body.row>
+          {{/each}}  
+
+          <body.row as |row|>
+            <row.cell>
+              <form.input
+                @type='text'
+                @name='ddddd'
+                @value={{@model.aa}}
+                @label={{t 'resources.auth-method.titles.new-from-claim'}}
+              />
+            </row.cell>
+            <row.cell @shrink={{true}}>
+              <Rose::Button
+                @style='secondary'
+                title={{t 'actions.add'}}
+               
+                @disabled={{if
+                  @model.isNew
+                  false
+                  (if form.isEditable false true)
+                }}
+                {{on
+                  'click'
+                  (fn
+                    @addStringItem 'filters' @model.aa
+                  )
+                }}
+              >
+                {{t 'actions.add'}}
+              </Rose::Button>
+            </row.cell>
+          </body.row>
+        </table.body>
+      </Rose::Table>
+    </:body>
   </Rose::Form::Fieldset>
 
   {{#if (can 'save model' @model)}}
diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs
index 340860893..cfa9f2591 100644
--- a/ui/admin/app/components/form/host-set/azure/index.hbs
+++ b/ui/admin/app/components/form/host-set/azure/index.hbs
@@ -80,6 +80,7 @@
   <form.textarea
     @name='filter'
     @type='filter'
+    @value={{@model.filter}}
     @label={{t 'form.provider.filter.label'}}
     @helperText={{t 'form.provider.filter.help'}}
     @linkText={{t 'form.provider.filter.link-text'}}
diff --git a/ui/admin/app/components/form/host-set/index.hbs b/ui/admin/app/components/form/host-set/index.hbs
index 5c3bd3f0c..55f9de05a 100644
--- a/ui/admin/app/components/form/host-set/index.hbs
+++ b/ui/admin/app/components/form/host-set/index.hbs
@@ -3,4 +3,6 @@
   model=@model
   submit=@submit
   cancel=@cancel
+  removeItemByIndex=@removeItemByIndex
+  addStringItem=@addStringItem
 }}
\ No newline at end of file
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js
index 31339c0dc..173dbcc6d 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js
@@ -1,4 +1,5 @@
 import Route from '@ember/routing/route';
+import { action } from '@ember/object';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetRoute extends Route {
   // =methods
@@ -49,4 +50,31 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetRoute exte
       }
     );
   }
+
+  /**
+   * Adds a string item to array `property` on the passed `filter`.
+   
+   * @param {hostSetModel} hostSet
+   * @param {string} property
+   * @param {string} value
+   */
+   @action
+   async addStringItem(hostSet, property, value) {
+     const array = hostSet.get(property);
+     array.addObject({ value });
+   }
+ 
+     /**
+    * Removes an item from array `property` at `index` on the
+    * passed `authMethod`.  This is used to manage entries in fragment array
+    * fields such as `signing_algorithms`.
+    * @param {hostSetModel} authMethod
+    * @param {string} property
+    * @param {number} index
+    */
+      @action
+      async removeItemByIndex(hostSet, property, index) {
+        const array = hostSet.get(property);
+        array.removeAt(index);
+      }
 }
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js
index 1f49ad3af..74afc4b4f 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js
@@ -1,4 +1,5 @@
 import Route from '@ember/routing/route';
+
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsIndexRoute extends Route {
   // =methods
   setupController(controller) {
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js
index 952e5d195..527d80a71 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js
@@ -63,4 +63,29 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsNewRoute extends
   async changeType(type) {
     await this.router.replaceWith({ queryParams: { type } });
   }
+  /**
+   * Adds a string item to array `property` on the passed `filter`.
+   
+   * @param {hostSetModel} hostSet
+   * @param {string} property
+   * @param {string} value
+   */
+   @action
+   async addStringItem(hostSet, property, value) {
+     const array = hostSet.get(property);
+     array.addObject({ value });
+   }
+       /**
+    * Removes an item from array `property` at `index` on the
+    * passed `authMethod`.  This is used to manage entries in fragment array
+    * fields such as `signing_algorithms`.
+    * @param {hostSetModel} authMethod
+    * @param {string} property
+    * @param {number} index
+    */
+        @action
+        async removeItemByIndex(hostSet, property, index) {
+          const array = hostSet.get(property);
+          array.removeAt(index);
+        }
 }
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs
index 36a777f60..724c55573 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs
@@ -2,4 +2,6 @@
   @model={{@model}}
   @submit={{route-action 'save' @model}}
   @cancel={{route-action 'cancel' @model}}
+  @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
+  @addStringItem={{route-action 'addStringItem' @model}}
 />
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs
index 941f3e819..4047f364c 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs
@@ -5,4 +5,6 @@
   @submit={{route-action 'save' @model}}
   @cancel={{route-action 'cancel' @model}}
   @changeType={{route-action 'changeType' @model.type}}
+  @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
+  @addStringItem={{route-action 'addStringItem' @model}}
 />
\ No newline at end of file