NOBUG mod_surveypro: fixed minor internal issues