UPnP : minor modification to clean-up templates