[++][FIX][Walker] Fix join clauses