filtering implemented
UI changes