Fixing bug where all fields would be checked whena  filter is active