CC optimization for filtered valuesets
CC optimization for filtered valuesets update