Only add the query string if it's not empty and it's not equal to '?'
Merge pull request #420 from orientalsensation/getUrlWithQueryString

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