[DF-1062] fixed selection order.