fix url and uuid handling