New HQLBuilder seems good! Have commented out the old doQuery method. It should be removed when we are totally happy everything is fine.