Query Builder Updates

Signed-off-by: Jay Rivers <JRivers@printplace.com>