Add backwards compatibility to the GEM v3.2 Taxonomy and fix handling of the HIM/HEI matching