MDL-46583 mod_surveypro: fixed the issue and added some minor improvements