Fix empty queries
Merge branch 'unstable' of github.com:sociam/indx into unstable