Change kwmap to tagmap in Storage

since not all items have keywords