Add hotfix for missing selected values in lists