code refactored
new filter dialog in progress