Changed query names.
Added some documentation