diff --git a/lib/src/sparql/dataset.rs b/lib/src/sparql/dataset.rs
index f54cc2f9..2e782308 100644
--- a/lib/src/sparql/dataset.rs
+++ b/lib/src/sparql/dataset.rs
@@ -1,10 +1,11 @@
use crate::sparql::algebra::QueryDataset;
use crate::sparql::EvaluationError;
use crate::storage::numeric_encoder::{
- EncodedQuad, EncodedTerm, ReadEncoder, StrContainer, StrEncodingAware, StrHash, StrLookup,
+ EncodedQuad, EncodedTerm, ReadEncoder, StrContainer, StrHash, StrLookup,
};
use crate::storage::Storage;
use std::cell::RefCell;
+use std::collections::hash_map::Entry;
use std::collections::HashMap;
use std::iter::empty;
@@ -154,40 +155,34 @@ impl DatasetView {
}
}
-impl StrEncodingAware for DatasetView {
+impl StrLookup for DatasetView {
type Error = EvaluationError;
-}
-impl StrLookup for DatasetView {
- fn get_str(&self, id: StrHash) -> Result