Improve guest questions