Fix settings issue to use one DB