[FORWARD PORT] LPS-50875 use correct element id