APD-428: Sort by dropdown fixed according to sort type
Merge branch 'APD-428-b' into develop