Fixed issues when import .XML forms