so many omgs
merging in unstable-well from laura

Merge branch 'unstable-well' of github.com:sociam/indx into unstable-well
Parentheses around subqueries to collect UNION and INTERSECT correctly
updatd queries
merging in latest fixes from unstable

Merge branch 'unstable' of github.com:sociam/indx into unstable-well
entiites