Update expressions and filters to reference each other