Fix codelist attribute linkage, fixes #35