diff --git a/source/Ox.UI/js/Form/Ox.Filter.js b/source/Ox.UI/js/Form/Ox.Filter.js
index 713f6751..79a617e7 100644
--- a/source/Ox.UI/js/Form/Ox.Filter.js
+++ b/source/Ox.UI/js/Form/Ox.Filter.js
@@ -15,8 +15,8 @@ Ox.Filter <f:Ox.Element> Filter Element
 
 Ox.Filter = function(options, self) {
 
-    var self = self || {},
-        that = Ox.Element({}, self)
+    self = self || {};
+    var that = Ox.Element({}, self)
             .defaults({
                 findKeys: [],
                 query: {
@@ -30,48 +30,46 @@ Ox.Filter = function(options, self) {
 
     Ox.print('Ox.Filter self.options', self.options)
 
-    $.extend(self, {
-        conditionOperators: {
-            date: [
-                {id: '', title: 'is'},
-                {id: '!', title: 'is not'},
-                {id: '<', title: 'is before'},
-                {id: '>', title: 'is after'},
-                {id: '-', title: 'is between'},
-                {id: '!-', title: 'is not between'}
-            ],
-            list: [
-                {id: '', title: 'is'},
-                {id: '!', title: 'is not'}
-            ],
-            number: [
-                {id: '', title: 'is'},
-                {id: '!', title: 'is not'},
-                {id: '<', title: 'is less than'},
-                {id: '>', title: 'is greater than'},
-                {id: '-', title: 'is between'},
-                {id: '!-', title: 'is not between'}
-            ],
-            string: [
-                {id: '=', title: 'is'},
-                {id: '!=', title: 'is not'},
-                {id: '', title: 'contains'},
-                {id: '!', title: 'does not contain'},
-                {id: '^', title: 'starts with'},
-                {id: '!^', title: 'does not start with'},
-                {id: '$', title: 'ends with'},
-                {id: '!$', title: 'does not end with'}
-            ],
-            text: [
-                {id: '', title: 'contains'},
-                {id: '!', title: 'does not contain'}
-            ]
-        },
-        operators: [
-            {id: '&', title: 'all'},
-            {id: '|', title: 'any'}
+    self.conditionOperators = {
+        date: [
+            {id: '', title: 'is'},
+            {id: '!', title: 'is not'},
+            {id: '<', title: 'is before'},
+            {id: '>', title: 'is after'},
+            {id: '-', title: 'is between'},
+            {id: '!-', title: 'is not between'}
+        ],
+        list: [
+            {id: '', title: 'is'},
+            {id: '!', title: 'is not'}
+        ],
+        number: [
+            {id: '', title: 'is'},
+            {id: '!', title: 'is not'},
+            {id: '<', title: 'is less than'},
+            {id: '>', title: 'is greater than'},
+            {id: '-', title: 'is between'},
+            {id: '!-', title: 'is not between'}
+        ],
+        string: [
+            {id: '=', title: 'is'},
+            {id: '!=', title: 'is not'},
+            {id: '', title: 'contains'},
+            {id: '!', title: 'does not contain'},
+            {id: '^', title: 'starts with'},
+            {id: '!^', title: 'does not start with'},
+            {id: '$', title: 'ends with'},
+            {id: '!$', title: 'does not end with'}
+        ],
+        text: [
+            {id: '', title: 'contains'},
+            {id: '!', title: 'does not contain'}
         ]
-    });
+    };
+    self.operators = [
+        {id: '&', title: 'all'},
+        {id: '|', title: 'any'}
+    ];
 
     if (!self.options.query.conditions.length) {
         self.options.query.conditions = [{
@@ -154,7 +152,7 @@ Ox.Filter = function(options, self) {
                             {id: 'ascending', title: 'ascending'},
                             {id: 'descending', title: 'descending'}
                         ],
-                        width: 96
+                        width: 128
                     }),
                     Ox.Label({
                         overlap: 'left',
@@ -163,7 +161,7 @@ Ox.Filter = function(options, self) {
                     })
                 ],
                 float: 'right',
-                width: 168
+                width: 200
             })
         ],
         separators: [
@@ -410,14 +408,14 @@ Ox.Filter = function(options, self) {
         var $input
         if (!isBetween) {
             $input = Ox.Input({
-                width: 256
+                width: 288
             });
         } else {
             $input = Ox.InputGroup({
                 inputs: [
                     Ox.Input({
                         id: 'start',
-                        width: 112
+                        width: 128
                     }),
                     /*
                     Ox.TimeInput({