Add some additional indexes for the most used queries