Issue 2521 more than one category on structure causes cats not to save properly