Refactor blacklist to separate filter