Fix sort order on current subs. closes #845