Search index creation fixes