Reimplementation of Basic Search - next step SearchIndex