Reduce indexing time

not ready for review yet