Add some indexes which get the query times down.