Cleanup Query classes

Query classes now use string concatenation instead of string builder classes