Work on a HQL variant of query builder. Added elvis operator to user menus
Merge