Ensure query string always starts with ? or & [RD-91]