Optimizations of reindexer functionality