ISqlQuery -> Query
join constructor fix