change to the handling of urls