Fix surveys controller conflicts