Added some comments to query.go
Renamed compose() to String()