diff --git a/addon/components/hyper-table-v2/filtering-renderers/numeric.hbs b/addon/components/hyper-table-v2/filtering-renderers/numeric.hbs
index 4bcffd7b..5cbd7d4d 100644
--- a/addon/components/hyper-table-v2/filtering-renderers/numeric.hbs
+++ b/addon/components/hyper-table-v2/filtering-renderers/numeric.hbs
@@ -24,38 +24,30 @@
       <div class="fx-row fx-gap-px-12">
         <div class="fx-col fx-gap-px-6">
           <label>{{t "hypertable.column.filtering.from"}}</label>
-          <OSS::InputContainer>
-            <:input>
-              <Input
-                @value={{this.lowerBoundFilter}}
-                @type="number"
-                placeholder={{t "hypertable.column.filtering.from"}}
-                aria-label={{t "hypertable.column.filtering.from"}}
-                autocomplete="off"
-                {{on "change" this.addRangeFilter}}
-                {{did-insert this.setupOnlyNumericListener}}
-                {{will-destroy this.teardownOnlyNumericListener}}
-                data-control-name={{concat "hypertable__column_filtering_for_" @column.definition.key "_range_from"}}
-              />
-            </:input>
-          </OSS::InputContainer>
+          <OSS::InputContainer
+            @value={{this.lowerBoundFilter}}
+            @type="number"
+            placeholder={{t "hypertable.column.filtering.from"}}
+            aria-label={{t "hypertable.column.filtering.from"}}
+            autocomplete="off"
+            {{on "change" this.addRangeFilter}}
+            {{did-insert this.setupOnlyNumericListener}}
+            {{will-destroy this.teardownOnlyNumericListener}}
+            data-control-name={{concat "hypertable__column_filtering_for_" @column.definition.key "_range_from"}}
+          />
         </div>
         <div class="fx-col fx-gap-px-6">
           <label>{{t "hypertable.column.filtering.to"}}</label>
-          <OSS::InputContainer>
-            <:input>
-              <Input
-                @type="number"
-                @value={{this.upperBoundFilter}}
-                placeholder={{t "hypertable.column.filtering.to"}}
-                autocomplete="off"
-                {{on "change" this.addRangeFilter}}
-                {{did-insert this.setupOnlyNumericListener}}
-                {{will-destroy this.teardownOnlyNumericListener}}
-                data-control-name={{concat "hypertable__column_filtering_for_" @column.definition.key "_range_to"}}
-              />
-            </:input>
-          </OSS::InputContainer>
+          <OSS::InputContainer
+            @type="number"
+            @value={{this.upperBoundFilter}}
+            placeholder={{t "hypertable.column.filtering.to"}}
+            autocomplete="off"
+            {{on "change" this.addRangeFilter}}
+            {{did-insert this.setupOnlyNumericListener}}
+            {{will-destroy this.teardownOnlyNumericListener}}
+            data-control-name={{concat "hypertable__column_filtering_for_" @column.definition.key "_range_to"}}
+          />
         </div>
       </div>
     {{/if}}
diff --git a/tests/integration/components/hyper-table-v2/filtering-renderers/numeric-test.ts b/tests/integration/components/hyper-table-v2/filtering-renderers/numeric-test.ts
index 4164d986..7a675eb5 100644
--- a/tests/integration/components/hyper-table-v2/filtering-renderers/numeric-test.ts
+++ b/tests/integration/components/hyper-table-v2/filtering-renderers/numeric-test.ts
@@ -174,9 +174,9 @@ module('Integration | Component | hyper-table-v2/filtering-renderers/numeric', f
       await click(
         'div[data-control-name="hypertable__column_filtering_for_total_existence_selector"] .fx-row:first-child .oss-radio-btn'
       );
-      await fillIn('[data-control-name="hypertable__column_filtering_for_total_range_from"]', '1');
+      await fillIn('[data-control-name="hypertable__column_filtering_for_total_range_from"] input', '1');
       await triggerKeyEvent(
-        '[data-control-name="hypertable__column_filtering_for_total_range_from"]',
+        '[data-control-name="hypertable__column_filtering_for_total_range_from"] input',
         'keydown',
         'Enter',
         //@ts-ignore
@@ -189,7 +189,7 @@ module('Integration | Component | hyper-table-v2/filtering-renderers/numeric', f
         ])
       );
 
-      await fillIn('[data-control-name="hypertable__column_filtering_for_total_range_to"]', '9');
+      await fillIn('[data-control-name="hypertable__column_filtering_for_total_range_to"] input', '9');
       await triggerKeyEvent(
         '[data-control-name="hypertable__column_filtering_for_total_range_to"]',
         'keydown',
@@ -221,8 +221,8 @@ module('Integration | Component | hyper-table-v2/filtering-renderers/numeric', f
           hbs`<HyperTableV2::FilteringRenderers::Numeric @handler={{this.handler}} @column={{this.column}} />`
         );
 
-        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_from"]').hasValue('10');
-        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_to"]').hasValue('1000');
+        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_from"] input').hasValue('10');
+        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_to"] input').hasValue('1000');
       });
 
       test('it automatically selects the with option ', async function (this: TestContext, assert: Assert) {
@@ -242,16 +242,16 @@ module('Integration | Component | hyper-table-v2/filtering-renderers/numeric', f
           hbs`<HyperTableV2::FilteringRenderers::Numeric @handler={{this.handler}} @column={{this.column}} />`
         );
 
-        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_from"]').hasValue('10');
-        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_to"]').hasValue('1000');
+        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_from"] input').hasValue('10');
+        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_to"] input').hasValue('1000');
         await click(
           'div[data-control-name="hypertable__column_filtering_for_total_existence_selector"] .fx-row:last-child .oss-radio-btn'
         );
         await click(
           'div[data-control-name="hypertable__column_filtering_for_total_existence_selector"] .fx-row:first-child .oss-radio-btn'
         );
-        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_from"]').hasValue('');
-        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_to"]').hasValue('');
+        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_from"] input').hasValue('');
+        assert.dom('[data-control-name="hypertable__column_filtering_for_total_range_to"] input').hasValue('');
       });
     });
   });