Improve issue indexing