more bugfixing for data-import process