Add clause JOIN to Query
final version