Various tweaks to get filters working.