Fix the custom filter mess.