Moved filter queries to their respective modules.