fix: Tries to fix the survey behavior - #1015

AyakorK wants to merge 2 commits into

fix: Tries to fix the survey behavior #1015
AyakorK wants to merge 2 commits into
developfrom
fix/surveys_behavior

feat: Multiple changes about surveys