SettingsStore fixes, fixes for MatNote