Wokrs on formatter system; refactor query builder use