Fixed 02 - added Queries