Added whitelist to filter
Minor output changes