-Codechange: use enums for enterFilter (based on patch by wangds)