fix ? and & in url

please merge and publish