[ENH] Improving the elasticsearch query builder

git-svn-id: file:///var/local/code.tiki.org/tikisvn/trunk@46640 b456876b-0849-0410-b77d-98878d47e9d5
[FIX] Generate a valid query when anonymous

git-svn-id: file:///var/local/code.tiki.org/tikisvn/trunk@46641 b456876b-0849-0410-b77d-98878d47e9d5