KHRES-309 #comment Add a bunch more indexes to fix speed