Fix big repo indexing && search overwriting error