fix bugs related to local admindatastorage