speed up s2 indexing a bit