Fixed issue with devicealbe_id not being saved