Clearer empty query string handling (thanks @avsm)