Add desc indexes, fix sorting bug