Beta1 & 2: Setting content on folder not saved

When running Kodi 17, my content folders don’t have the correct content type (it is none)
I have tried to change it to Movies (and TV-Series) and save it.
If I then open up the Change content again it reverts to None.

The main problem is that because of this the Library Update will not run because I don’t have any specified content.
I can access the files by going Videos -> Files -> Folder

Some background info:
Running on Windows 10 with a NAS and MySQL
Did an upgrade from 16.1 to 17 beta 1 – didn’t work
Did a fresh install of 17 beta 1, and copied advancedsettings.xml and sources.xml into the userdata folder – didn’t work
Reverted back to 16.1 – works fine
Did an upgrade to 17 beta 2 – didn’t work

Anyone else having the problem or any idea how to fix it?