Updated functions for IC 20 and 21 such that return values are a map of
values with a set of code lists not including the corresponding values