There are major changes to the search functionality coming. I had heard 2018.1 at one point, but I don't see it in the release notes.