Added three indexes, don't know if we need others unless we change how we query