Added EditableLabel for inline editing of the filter
Refactoring