reindexing fixes

reindexing fixes