Fix & style surveys
DB structure changes