fixes for surveys