diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index e1ae8d78..805dd77f 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -212,7 +212,31 @@
 
                         <!-- INTEGER BUILDER  -->
                         <div v-if="item.uiFieldDataType === 5">
-                          INTEGER BUILDER
+                          <v-select
+                            v-model="item.tempFilterOperator"
+                            :items="pickLists.integerFilterOperators"
+                            item-text="name"
+                            item-value="id"
+                            :label="lt('Filter')"
+                            prepend-icon="fa-filter"
+                          ></v-select>
+                          <v-text-field
+                            v-if="
+                              item.tempFilterOperator != null &&
+                                item.tempFilterOperator != '*NOVALUE*' &&
+                                item.tempFilterOperator != '*HASVALUE*'
+                            "
+                            v-model="item.tempFilterValue"
+                            clearable
+                            type="number"
+                          ></v-text-field>
+                          <v-btn
+                            large
+                            block
+                            v-if="item.tempFilterOperator != null"
+                            @click="addFilterCondition(item)"
+                            ><v-icon large>fa-plus</v-icon></v-btn
+                          >
                         </div>
                         <!-- BOOL BUILDER  -->
                         <div v-if="item.uiFieldDataType === 6">
@@ -221,11 +245,57 @@
 
                         <!-- DECIMAL BUILDER -->
                         <div v-if="item.uiFieldDataType === 7">
-                          DECIMAL BUILDER
+                          <v-select
+                            v-model="item.tempFilterOperator"
+                            :items="pickLists.integerFilterOperators"
+                            item-text="name"
+                            item-value="id"
+                            :label="lt('Filter')"
+                            prepend-icon="fa-filter"
+                          ></v-select>
+                          <gz-decimal
+                            v-if="
+                              item.tempFilterOperator != null &&
+                                item.tempFilterOperator != '*NOVALUE*' &&
+                                item.tempFilterOperator != '*HASVALUE*'
+                            "
+                            v-model="item.tempFilterValue"
+                            clearable
+                          ></gz-decimal>
+                          <v-btn
+                            large
+                            block
+                            v-if="item.tempFilterOperator != null"
+                            @click="addFilterCondition(item)"
+                            ><v-icon large>fa-plus</v-icon></v-btn
+                          >
                         </div>
                         <!-- CURRENCY BUILDER  -->
                         <div v-if="item.uiFieldDataType === 8">
-                          CURRENCY BUILDER
+                          <v-select
+                            v-model="item.tempFilterOperator"
+                            :items="pickLists.integerFilterOperators"
+                            item-text="name"
+                            item-value="id"
+                            :label="lt('Filter')"
+                            prepend-icon="fa-filter"
+                          ></v-select>
+                          <gz-currency
+                            v-if="
+                              item.tempFilterOperator != null &&
+                                item.tempFilterOperator != '*NOVALUE*' &&
+                                item.tempFilterOperator != '*HASVALUE*'
+                            "
+                            v-model="item.tempFilterValue"
+                            clearable
+                          ></gz-currency>
+                          <v-btn
+                            large
+                            block
+                            v-if="item.tempFilterOperator != null"
+                            @click="addFilterCondition(item)"
+                            ><v-icon large>fa-plus</v-icon></v-btn
+                          >
                         </div>
                         <!-- TAG BUILDER  -->
                         <div v-if="item.uiFieldDataType === 9">TAG BUILDER</div>
diff --git a/ayanova/src/views/test-inventory-widget-edit.vue b/ayanova/src/views/test-inventory-widget-edit.vue
index 397ab755..12ab177d 100644
--- a/ayanova/src/views/test-inventory-widget-edit.vue
+++ b/ayanova/src/views/test-inventory-widget-edit.vue
@@ -82,7 +82,7 @@
               lg="4"
               xl="3"
             >
-              <!-- <gz-currency
+              <gz-currency
                 v-model="obj.dollarAmount"
                 :readonly="this.formState.readOnly"
                 :label="lt('WidgetDollarAmount')"
@@ -93,9 +93,9 @@
                 ]"
                 :error-messages="form().serverErrors(this, 'dollarAmount')"
                 @input="onChange('dollarAmount')"
-              ></gz-currency> -->
+              ></gz-currency>
 
-              <gz-decimal
+              <!-- <gz-decimal
                 v-model="obj.dollarAmount"
                 :readonly="this.formState.readOnly"
                 :label="lt('WidgetDollarAmount')"
@@ -106,7 +106,7 @@
                 ]"
                 :error-messages="form().serverErrors(this, 'dollarAmount')"
                 @input="onChange('dollarAmount')"
-              ></gz-decimal>
+              ></gz-decimal> -->
             </v-col>
 
             <v-col cols="12" sm="6" lg="4" xl="3">