added whitelist filtering