remove extra param in url when new survey
clean up based on code review with david
merge from master davids changes to set-entry
survey template show improvements - survey_questions and extension