More effective WhiteList NER implementation
Refreshed whitelists