Move blacklist filtering into a better place