Improve tags so that orphans aren't returned and they are sorted by
usage