Improve the choice Loading module from XLSForm