ESQuery changes - fix default size, misc additions
Replace es_query with ESQuery (fixes WebUser bug)