allow re-indexing and deleting mapping + fix ds entry output