Fix to eliminate unwanted '&' in the url