Added filter for ENUMSET & SETSET