milestone #2 - queries with and without fields are now supported