Add enumeration filter
Resolve some issues