Try more filter, less query [refs #83323852]