Bugfix: Use correct query with type for findAll and get doc by id in find