correct parameter and entity name in queries
Merge pull request #1369 from craigh/queryfix

correct parameter and entity name in queries