Improve/sort targets by type