added thing
sorted out order bug
Merge remote-tracking branch 'origin/diffquery3' into diffquery
Fix clobbered diffs