[ORB-332] Fixed order of site options