Return all entities instead of only jpa entities + small stuff

- Return all entities instead of only jpa entities
- Small stuff