Added whitelist to Query