fix issues with resolveuid urls