Fixed issues with choice elements after previous big change