fix adding data on datastore pop id handle none