Support new term/taxonomy structure in batch import
Fix import of terms/taxonomies