Fixed plotting on popview back with datastore