Building my own query for assignment to URI was causing issues as it was not proberly handling escaping whitespace, etc.
Merge remote-tracking branch 'origin/master' into google-search-appliance-compatibility