Merging changes to filter dialog with Johns changes
s