Fixed silly-goose issues with the query