More fixes to searching/indexing.