better indexer
Test case for upgrading