[CLC-1638] New sorting schema

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1638