added default query impl
Merge branch 'develop'