Tag storage and delete fixed