Refactor versions.xml script & fix 10.1.1 error