Added support for non-hierarchical taxonomies