#291 Get db into working shape for album use