Fix taxonomy sort

- Was normalized input of sort taxonomy because I do not trust human beings.
- Was removed the 'else' for best practices.
Merge pull request #2007 from jackmakiyama/taxonomy_sort

Improved taxonomy sort