Studio/import performance

Fix performance of XML Import. STUD-1994