Fix matching on null searcher