LPS-50857 always fetch UID
LPS-50857 SF