The "Cancel" button on queries is the only way that you can close the query, but that is confusing to users who arrive at the query through the "Results" link. They don't want to cancel anything, they just want to close it and move on. Is there a wording that would be more suitable to all user situations?
absolutely - there's a Save and Close button, there should be just a Close option.