fix mongo queries to support {$query: ...} or not