Taxonomy data table support for #972