fix deviceLocation deviceId, deviceLocation from api in map