new way for byId
reversed databaseSetup.js
Merge branch 'feature/lets-clean' into develop