The special casing in the intermediate block format is actually introduced by modeling it as aggregation. Ideally it should use the same format as selection query, but that will involve backward-incompatible change