Use dataId instead of URL on the client side