Make blacklist a bit more universal