continuation of refactoring of taxon property enrichment