Moved join to Query.