Add expression resolution in join expression as well