Handle importing of terms properly for each scenario, mapped, unmapped and hierarchical for both