Query builder functionality upgrade

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