Refactor filters and Loaders. Simplify and Generify all the things.