Reflect the comments by Susumu
Merge pull request #130 from KiiCorp/CMO3528-QueryObject

Reflect the comments by Susumu