Made importing of site template more robust.