Fixed minor bug handling None|Null value, changed type of whitelist from list to dictionary