- move DAO methods to entities
- fixes to fragments