Minor changes to query.coffee