Bugs with whitelist service