Fix multi-diff scalability weirdness issue
dan fixed slowness mergin in

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3