Handle wide results
Merge branch 'mult-shard'