9c0c258 adapt to new db structure