Reorganized filters, removed FilterChangeListener