CAAERS-6748 fix order of elements