More filter tweaks; prevented duplicate filters