Refactors SimpleSearchProvider
https://reviews.apache.org/r/16694/