Added in a bunch of indices, speeds up frontend queries