Fix empty database settings
WIP