fix: use UID in REST