stay in indexes as long as possible
Merge pull request #479 from Athou/disk-io

stay in indexes as long as possible