merging in dans changes

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3
diffquery fix for exception pertaining to multiple calls

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