updated: device value editing to return back the right tab in device screen