issues with Video – Files list (remote shares)

Running Kodi 15.2 on a Raspberry Pi 2.

I have two issues with the Video – Files list of remote shares.

The media source is Serviio 1.5.2 on a PC running Windows 7 Pro, with a fixed LAN IP.

After adding a UPNP share location (Public Videos folder on the PC) everything is fine, until the Windows PC gets rebooted for some reason. After a reboot, when I try to access the files I get an error message saying “Couldn’t connect to network server”.

I can “Add files” again (through Browse UPNP) and create another remote share entry, which is all good until the PC gets re-booted again. The PC doesn’t get rebooted very often but I now have an ever growing list of remote shares that no longer work!

I have two questions;

1. Is there something I can do so that the remote share remains accessible after the PC has been re-booted?

2. How do I remove defunct remote shares from the Video – Files list?