Additional small change   - nestes join/where clauses are now reconized