Added checks on filter values