replicate ignore_invalid_choices logic on non expanded fields