Use better tag sorting

Related Github issues
None

Working branch
master