Added two indexes to improve query performance.