Moved Query out into its own class.
Improved privacy filters