Only add the request query string if it's non-empty and not equal to '?'