Added field expansion to Query line