all survey handlers fixed except main