Fixed indexing errors on large data and indexing ui