fix query
Rename fields according [12606]
Merge pull request #145 from Ravie/master

Continuation of Tafuna corrections