Add more indexes for common queries. #56