Codelists issue solved