add device id for watched and alarm sensor