Classified search fix