improve db recipes
Merge commit '3c45ebc449e1b6b643601d800d25b887628e64f7'