Fixing inconsistent behaviour between SimpleQuery and complex queries.
[src] conn fixes