Added indexing and aggregation first queries