HR-301 - ClientSide EntityRef improvements