OPAL-2680 Taxonomy display refactored