DSS-126 #time 2h Resolving issues related to sorting