Fixes international survey

fix #263
fix #258