new fixes to formatter and query builder