Cleaned up query processor
Removed some unused imports
Added callback API to query
Callback API works
Updated naming convention for query attributes