Other way for search does not work for at least two of our machines, it is assumed not to work and should not have been pushed to master