Changed the mappers to use hashes, refactored the combined filter