[LAB-108] change selection order of type field

Merged Felipe requested to merge LAB-108 into 12.0-stage

Merge request reports