Fix query string order when getting current URL