Taxon sorting for 2-1-stable fix

Fixes #3989