Fixing up the EntryFilter