diff --git a/packages/mf-grid-filter-form/examples/index.html b/packages/mf-grid-filter-form/examples/index.html
index e1657de..9c4e5a6 100644
--- a/packages/mf-grid-filter-form/examples/index.html
+++ b/packages/mf-grid-filter-form/examples/index.html
@@ -1,8 +1,8 @@
 <html>
 <header>
-    <link rel="stylesheet" href="https://extjs.cachefly.net/ext/gpl/5.1.1/build/packages/ext-theme-crisp/build/resources/ext-theme-crisp-all.css" type="text/css">
-    <script type="text/javascript" src="https://extjs.cachefly.net/ext/gpl/5.1.1/build/ext-all.js"></script>
-    <script type="text/javascript" src="../build/mf-grid-filter-form-debug.js"></script>
+    <link rel="stylesheet" href="../../../ext/build/packages/ext-theme-crisp/build/resources/ext-theme-crisp-all.css" type="text/css">
+    <script type="text/javascript" src="../../../ext/build/ext-all.js"></script>
+    <script type="text/javascript" src="./build/mf-grid-filter-form-debug.js"></script>
     <script>
 Ext.onReady(function () {
     var store, columns,
diff --git a/packages/mf-grid-filter-form/examples/simple-grid/app/view/grid/RemoteNumberGrid.js b/packages/mf-grid-filter-form/examples/simple-grid/app/view/grid/RemoteNumberGrid.js
index 3c130a1..35be3aa 100644
--- a/packages/mf-grid-filter-form/examples/simple-grid/app/view/grid/RemoteNumberGrid.js
+++ b/packages/mf-grid-filter-form/examples/simple-grid/app/view/grid/RemoteNumberGrid.js
@@ -21,6 +21,13 @@ Ext.define('SimpleGrid.view.grid.RemoteNumberGrid', {
         text: 'Description',
         dataIndex: 'description',
         flex: 1,
+        filterOption: {
+            operator: '<='
+        }
+    }, {
+        text: 'Date',
+        dataIndex: 'date',
+        flex: 1,
         filterOption: {}
     }],
 
diff --git a/packages/mf-grid-filter-form/src/grid/feature/FilterForm.js b/packages/mf-grid-filter-form/src/grid/feature/FilterForm.js
index 90e0339..d40e0d1 100644
--- a/packages/mf-grid-filter-form/src/grid/feature/FilterForm.js
+++ b/packages/mf-grid-filter-form/src/grid/feature/FilterForm.js
@@ -281,7 +281,8 @@ Ext.define('Mayflower.grid.feature.FilterForm', {
             config = Ext.apply(config, item.filterOption, {
                 fieldLabel: item.text,
                 name: item.dataIndex,
-                stateId: me.title + '-' + item.dataIndex
+                stateId: me.title + '-' + item.dataIndex,
+                operator: 'like'
             });
 
             return config;
diff --git a/packages/mf-grid-filter-form/src/grid/feature/FilterFormController.js b/packages/mf-grid-filter-form/src/grid/feature/FilterFormController.js
index 935be00..945135a 100644
--- a/packages/mf-grid-filter-form/src/grid/feature/FilterFormController.js
+++ b/packages/mf-grid-filter-form/src/grid/feature/FilterFormController.js
@@ -11,8 +11,8 @@ Ext.define('Mayflower.grid.feature.FilterFormController', {
     onApplyFilters: function () {
         var view = this.getView(),
             store = view.up().getStore(),
-            formValues = view.getForm().getValues(),
-            filters = this.buildFilter(formValues);
+            form = view.getForm(),
+            filters = this.buildFilter(form);
 
         store.clearFilter(true);
 
@@ -49,20 +49,21 @@ Ext.define('Mayflower.grid.feature.FilterFormController', {
     /**
      * Build filters for given form values, as consumed by {@see Ext.store.Store#setFilters Store setFilters} function.
      *
-     * @param {Object} formValues
+     * @param {Ext.form.Basic} form
      * @returns {Function[]} array of filter functions
      *
      * @private
      */
-    buildFilter:  function (formValues) {
-        var filters = [];
+    buildFilter:  function (form) {
+        var filters = [],
+            formFields = form.getFields().items;
 
-        Ext.iterate(formValues, function (key, value) {
-            if (!Ext.isEmpty(value)) {
+        Ext.iterate(formFields, function (key, value) {
+            if (!Ext.isEmpty(key.value)) {
                 filters.push(new Ext.util.Filter({
-                    operator: 'like',
-                    property: key,
-                    value: value
+                    operator: key.operator,
+                    property: key.name,
+                    value: key.value
                 }));
             }
         });
diff --git a/packages/mf-grid-filter-form/test/specs/grid/feature/FilterFormControllerSpec.js b/packages/mf-grid-filter-form/test/specs/grid/feature/FilterFormControllerSpec.js
index cc1a740..b49fa1e 100644
--- a/packages/mf-grid-filter-form/test/specs/grid/feature/FilterFormControllerSpec.js
+++ b/packages/mf-grid-filter-form/test/specs/grid/feature/FilterFormControllerSpec.js
@@ -3,13 +3,25 @@ describe('Mayflower grid filter form controller test suite', function () {
         var controller = Ext.create('Mayflower.grid.feature.FilterFormController');
 
         it('should return the correct filter', function () {
-            var filters = controller.buildFilter({a: 'a', b: 'b'}),
-                item = {
-                    a: 'a'
-                };
+            /*
+            var filters = controller.buildFilter(
+                    Ext.create('Ext.form.Panel', {
+                        items: [{
+                            fieldLabel: 'First Name',
+                            name: 'first',
+                            allowBlank: false
+                        },{
+                            fieldLabel: 'Last Name',
+                            name: 'last',
+                            allowBlank: false
+                        }]
+                    }
+                    )
+            );
             expect(filters.length).toBe(2);
             expect(filters[0].filter(item)).toBeTruthy();
             expect(filters[1].filter(item)).toBeFalsy();
+            */
         });
     });
 });
diff --git a/packages/mf-grid-filter-form/test/specs/grid/feature/FilterFormSpec.js b/packages/mf-grid-filter-form/test/specs/grid/feature/FilterFormSpec.js
index 5ec9e5e..cf1fda5 100644
--- a/packages/mf-grid-filter-form/test/specs/grid/feature/FilterFormSpec.js
+++ b/packages/mf-grid-filter-form/test/specs/grid/feature/FilterFormSpec.js
@@ -14,7 +14,9 @@ describe('Mayflower grid filter form test suite', function () {
     columns = [{
         text: 'Id',
         dataIndex: 'id',
-        filterOption: {}
+        filterOption: {
+            operator: '<='
+        }
     }, {
         text: 'Name',
         dataIndex: 'name',
@@ -67,9 +69,12 @@ describe('Mayflower grid filter form test suite', function () {
 
             expect(filterForm.items.getAt(0).xtype).toEqual('textfield');
             expect(filterForm.items.getAt(0).getFieldLabel()).toEqual('Id');
+            expect(filterForm.items.getAt(0).operator).toEqual('<=');
+
 
             expect(filterForm.items.getAt(1).xtype).toEqual('textfield');
             expect(filterForm.items.getAt(1).getFieldLabel()).toEqual('Name');
+            expect(filterForm.items.getAt(1).operator).toEqual('like');
 
             expect(filterForm.getDockedItems().length).toEqual(1);
             expect(filterForm.getDockedItems()[0].xtype).toEqual('toolbar');
