fixed db key issues