Updating `utility.queryString()` to handle more cases