Feature/v6, fix url