- fix issue with object properties
- fix bug in QueryMapper