fix incorrect processing of urls with ampersands