Minor modif and fix survey import