Improved autoindexing