Entry query filters fix