Taxonomy feature sort - use Query alter

#1048