Fixing Issue401

No need to check if mode is present, just check if == something.

If a constant, just use "new", not "new survey"