Added whitelist validation to search