fixing dao query when no query param is provided
Merge remote-tracking branch 'upstream/master'