Filter fixes.