Add more crazy cases. Like if the query string starts with ? make sure we don't append it multiple times.