Folder settings in mappings don't save consistently

[isc-tleavitt]

Use case: set up mappings like the below:

Save them.

Change basic mode, then save again. Reload the page - the NoFolders status is lost from (at least) the display. Not sure if it's still present in the global.