PlentyGorge: Fixed survey form logic