When initially adding a new Product/Service, the folder icon allows selecting the folder and it will save correctly. When you add or edit a second product, the folder displays as the last selected but saves as the default blank one. The only way I can find to have it save correctly is to edit the wrong record, then select the default blank folder, then select the correct folder, and hit save.