[ORB-280] various element changes