[DCSSW-172] fix for join and delete issues outlined in this ticket