[PMD-716] validate and update complex joins pt1