Added choice for any or all entities in taxon query.