diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
index a96d7c433..472be139a 100644
--- a/src/components/app/DocumentList.js
+++ b/src/components/app/DocumentList.js
@@ -251,6 +251,12 @@ class DocumentList extends Component {
             clickOutsideLock: !!value
         })
     }
+    
+    clearStaticFilters = () => {
+        const {dispatch, windowType, viewId} = this.props;
+
+        dispatch(push('/window/' + windowType));
+    }
 
     // FETCHING LAYOUT && DATA -------------------------------------------------
 
@@ -498,6 +504,7 @@ class DocumentList extends Component {
                                     filterData={layout.filters}
                                     filtersActive={filters}
                                     updateDocList={this.handleFilterChange}
+                                    clearStaticFilters={this.clearStaticFilters}
                                 />}
                             </div>
                             <QuickActions
diff --git a/src/components/filters/Filters.js b/src/components/filters/Filters.js
index 01a4c17d1..b97b2f632 100644
--- a/src/components/filters/Filters.js
+++ b/src/components/filters/Filters.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import {push} from 'react-router-redux';
 
 import FiltersFrequent from './FiltersFrequent';
 import FiltersNotFrequent from './FiltersNotFrequent';
@@ -117,11 +118,12 @@ class Filters extends Component {
     // RENDERING FILTERS -------------------------------------------------------
 
     render() {
-        const {filterData, windowType, viewId} = this.props;
+        const {filterData, windowType, viewId, clearStaticFilters} = this.props;
         const {
             frequentFilters, notFrequentFilters, staticFilters
         } = this.sortFilters(filterData);
         const {notValidFields, widgetShown, filter} = this.state;
+
         return (
             <div className="filter-wrapper js-not-unselect">
                 <span>Filters: </span>
@@ -154,12 +156,18 @@ class Filters extends Component {
                             dropdownToggled={this.dropdownToggled}
                         />
                     }
-                    {!!staticFilters.length &&
+                    
+                    
+                    {
+                        //TODO: temporary solution to refactor.
+                        // Structure data/layout corrupted.
+                    }
+                    {filter && filter.static && (
                         <FiltersStatic
-                            data={staticFilters}
-                            clearFilters={this.clearFilters}
+                            data={[filter]}
+                            clearFilters={clearStaticFilters}
                         />
-                    }
+                    )}
                 </div>
             </div>
         )