Homekit Problems when changeing items

Hello, im using OH2.3 with Homekit Integration. When i change my configuration the Bridge in Homekit first stops working and after some time (~30min) the switches are back. But i have to give every thing a new room because all items are now in the standard room.

How can i change this behaviour?

Thank you!