Fixes #8805 - Taxonomies duplication refactor