CSV ingest: proper handling of hierarchical AND flat annotated things