Fix stream restoration in join parser + extra test.