Fix string moving in the storage and table