FC-1335 - Better support for code lists from lookup tables