(squash before merging) more PR fixes
(squash before merging) don't query with or in mongodb