Remove duplicate code for setting defaults
Hide saved query echos for now