Also add sorting by rank first, then category for the property set tree