Changing Group/Folder property bug

New bug with 8.1.....kind of tough to explain.

So...I group my sessions starting with the company name (with a company property), then create subgroups for each physical site within the company. Each physical has a RDP sessions, VMware connections, webpage links, etc.

Most of these physical locations were imported from a CSV file with the basic information. However, none of these imported sessions were populated with the correct IP addresses, server name, etc. So, when i need to work on a physical location for the first time, I need to populate the appropriate information. By default, these non-configured groups use the folder icon to designate the location has not been populated. After I complete populating the physical location information, I change the icon to the "Site" property.

Now, after upgrading, whenever I change from the folder icon to the site icon, the site disappears. At first, I thought it was deleted. However, I discovered that the site was moved/transplanted outside of the nested structure I setup, to another folder, with the same top-level company name (just with a folder icon, instead of the Company icon) at the bottom of the sessions list.

I move the transplanted site group back to the correct company group without issue. The "rogue" company name also disappears.

Hopefully this makes sense.