remove returning scope when query is empty
remove returning scope when query is empty

Always assume that the query is specified due to the changes to the
return object that contains an array of ids and returnAttributes.

sikuli/sieveable,sikuli/sieveable