refix resolveuid feature