Remove query based aggregation, the ops needed for this are missing
Doc fixes