add specific case of Uid when building filter