Faster Ctrl P indexing