scoped by a database field
scoped with postgresql, schemas and apartment
tidied up the current account helper