Continued Refactor of QueryBuilder. Data types more appropriate, no
longer rely on string representations of critical data.