VMWC: Survey Logic Fix