Fixed build issue
Fixed codelist loading