Changes in index and search algorithms addressing #45