Whitelist status improvements