diff --git a/lib/ui/dropdown.d.ts b/lib/ui/dropdown.d.ts
index dbbb37b..6d2ec86 100644
--- a/lib/ui/dropdown.d.ts
+++ b/lib/ui/dropdown.d.ts
@@ -37,9 +37,11 @@ export class Dropdown {
     set disabled(flag: boolean);
     get source(): Array<DropdownItem | any>;
     set source(list: Array<DropdownItem | any>);
-    readonly multiselect: boolean;
-    readonly selected: DropdownItem | any;
-    readonly selectedlist: Array<DropdownItem | any>;
+
+    get multiselect(): boolean;
+    get selected(): DropdownItem | any;
+    get selectedlist(): Array<DropdownItem | any>;
+
     create(): HTMLElement;
     select(selected: string, silence?: boolean): void;
     selectlist(selectedlist: Array<string>, silence?: boolean): void;
diff --git a/lib/ui/dropdown.js b/lib/ui/dropdown.js
index b76bc26..2ee73e6 100644
--- a/lib/ui/dropdown.js
+++ b/lib/ui/dropdown.js
@@ -20,18 +20,20 @@ if (dropdownGlobal == null) {
         configurable: false,
         enumerable: false,
         value: function () {
-            const panel = document.querySelector('.ui-drop-box.active');
-            if (panel == null) {
-                return;
-            }
-            panel.classList.remove('active');
-            const dropId = panel.parentElement.dataset.dropId;
-            if (dropId == null) {
-                return;
-            }
-            const dropdown = this[dropId];
-            if (dropdown?.multiselect && typeof dropdown.oncollapsed === 'function') {
-                dropdown.oncollapsed();
+            const panels = document.querySelectorAll('.ui-drop-box.active');
+            for (let panel of [...panels]) {
+                if (panel == null) {
+                    continue;
+                }
+                panel.classList.remove('active');
+                const dropId = panel.parentElement.dataset.dropId;
+                if (dropId == null) {
+                    continue;
+                }
+                const dropdown = this[dropId];
+                if (dropdown?.multiselect && typeof dropdown.oncollapsed === 'function') {
+                    dropdown.oncollapsed();
+                }
             }
         }
     })
diff --git a/lib/ui/grid/column.d.ts b/lib/ui/grid/column.d.ts
index 9fbb8fc..0b6c2c4 100644
--- a/lib/ui/grid/column.d.ts
+++ b/lib/ui/grid/column.d.ts
@@ -50,14 +50,20 @@ export class GridColumn {
     static setEnabled(element: HTMLElement, enabled?: boolean): void;
 }
 
-export class GridInputColumn extends GridColumn { }
+export class GridInputColumn extends GridColumn {
+    static get editing(): boolean;
+}
 
 export class GridTextColumn extends GridInputColumn { }
 
-export class GridDropdownColumn extends GridColumn { }
+export class GridDropdownColumn extends GridColumn {
+    static leaveEdit(element: HTMLElement, container: HTMLElement): void;
+}
 
 export class GridCheckboxColumn extends GridColumn { }
 
 export class GridIconColumn extends GridColumn { }
 
-export class GridDateColumn extends GridColumn { }
\ No newline at end of file
+export class GridDateColumn extends GridColumn {
+    static formatDate(date: Date): string;
+}
\ No newline at end of file
diff --git a/lib/ui/grid/column.js b/lib/ui/grid/column.js
index b721be6..ac51b69 100644
--- a/lib/ui/grid/column.js
+++ b/lib/ui/grid/column.js
@@ -111,9 +111,18 @@ export class GridDropdownColumn extends GridColumn {
             wrapper
         });
         drop.onselected = trigger;
-        if (typeof col.onDropExpanded === 'function') {
-            drop.onexpanded = col.onDropExpanded.bind(col, it.values, drop);
-        }
+        drop.onexpanded = function () {
+            if (it.__editing == null) {
+                it.__editing = {
+                    [col.key]: true
+                }
+            } else {
+                it.__editing[col.key] = true;
+            }
+            if (typeof col.onDropExpanded === 'function') {
+                col.onDropExpanded.call(col, it.values, drop);
+            }
+        };
         return drop.create();
     }
 
@@ -201,6 +210,21 @@ export class GridDropdownColumn extends GridColumn {
         }
         drop.disabled = enabled === false;
     }
+
+    static leaveEdit(element, wrapper) {
+        wrapper.querySelectorAll('.ui-drop-box.active').forEach(e => {
+            if (e != null) {
+                e.classList.remove('active');
+            }
+        });
+        const drop = this._getDrop(element);
+        if (drop == null) {
+            return;
+        }
+        if (drop?.multiselect && typeof drop.oncollapsed === 'function') {
+            drop.oncollapsed();
+        }
+    }
 }
 
 export class GridCheckboxColumn extends GridColumn {
diff --git a/lib/ui/grid/grid.js b/lib/ui/grid/grid.js
index cec2afe..6e1c15a 100644
--- a/lib/ui/grid/grid.js
+++ b/lib/ui/grid/grid.js
@@ -359,6 +359,24 @@ export class Grid {
     }
 
     reload(keep) {
+        const filtered = this.columns.some(c => c.filterValues != null);
+        if ((filtered ^ this._var.colAttrs.__filtered) === 1) {
+            this._var.colAttrs.__filtered = filtered;
+            const headers = this._var.refs.header.children;
+            for (let i = 0; i < this.columns.length; ++i) {
+                const ele = headers[i].querySelector('.filter');
+                if (ele == null) {
+                    continue;
+                }
+                if (this.columns[i].filterValues != null) {
+                    ele.classList.add('active');
+                } else {
+                    ele.classList.remove('active');
+                }
+            }
+            this._refreshSource();
+            return;
+        }
         let length = this._var.currentSource.length;
         if (this.extraRows > 0) {
             length += this.extraRows;
@@ -699,12 +717,6 @@ export class Grid {
                 row.classList.remove('selected');
             }
             // data
-            // const selectChanged = vals.__selected ^ selected;
-            // if (selected) {
-            //     vals.__selected = true;
-            // } else {
-            //     delete vals.__selected;
-            // }
             cols.forEach((col, j) => {
                 if (col.visible === false) {
                     return;
@@ -734,9 +746,14 @@ export class Grid {
                 const type = isCheckbox ? GridCheckboxColumn : this._var.colTypes[col.key] ?? GridColumn;
                 let element;
                 if (!isCheckbox && typeof type.createEdit === 'function') {
-                    if (vals.__editing?.[col.key] && type.editing) {
-                        val = type.getValue({ target: cell.children[0] }, col);
-                        this._onRowChanged(null, startIndex + i, col, val, cell, true);
+                    if (vals.__editing?.[col.key]) {
+                        if (typeof type.leaveEdit === 'function') {
+                            type.leaveEdit(cell.children[0], this._var.el);
+                        }
+                        if (type.editing) {
+                            val = type.getValue({ target: cell.children[0] }, col);
+                            this._onRowChanged(null, startIndex + i, col, val, cell, true);
+                        }
                     }
                     element = selected ?
                         type.createEdit(e => this._onRowChanged(e, startIndex + i, col, type.getValue(e, col), cell), col, this._var.el, vals) :
@@ -1184,7 +1201,7 @@ export class Grid {
                 reset.innerText = this.langs.reset;
                 reset.addEventListener('click', () => {
                     delete col.filterValues;
-                    this._var.colAttrs.__filtered = this.columns.some(c => col.filterValues != null)
+                    this._var.colAttrs.__filtered = this.columns.some(c => c.filterValues != null)
                     this._refreshSource();
                     if (typeof col.onFiltered === 'function') {
                         col.onFiltered.call(this, col);
diff --git a/vite.build.js b/vite.build.js
index 3a70c0a..3181c8c 100644
--- a/vite.build.js
+++ b/vite.build.js
@@ -23,6 +23,7 @@ const libraries = [
         }
       },
       sourcemap: true,
+      outDir: '../../../../IronIntel/Contractor2.0/Contractor/Site/js/lib',
       emptyOutDir: false
     }
   },