Search Filter improvements implemented