Settings now honor empty database