Rework survey routes