added some additional indexes to try and speed this up further

Made some additional indexes to try and further improve the performance.