Survey issues

Work In Progress to fix #260.