Added support for encoding body template variables
Remove println
Added field expansion to Query line