adjusted _parseQueryShape to check for embedded query field