Added an index to speed up the queries significantly