Temporary fix for demo purposes: Codelists flatten added