fix: Reference subquery columns instead of outer columns where appropriate

fix: Reference subquery columns instead of outer columns where appropriate #1417