added back the g object to the query
Small changes
Small changes