Sujit: before trying out ben's tokens-updated-search-index branch