DB queries updated