Correct type sig
Introduce type Query
Adjust spacing
Expand on aggregation