Whitelisting improved

Whitelisting should be more efficient and accurate.