diff --git a/askomics/libaskomics/BedFile.py b/askomics/libaskomics/BedFile.py
index dc2aba3e..0d3be5ff 100644
--- a/askomics/libaskomics/BedFile.py
+++ b/askomics/libaskomics/BedFile.py
@@ -299,12 +299,14 @@ def generate_rdf_content(self):
             self.graph_chunk.add((begin, self.faldo.position, faldo_start))
 
             self.graph_chunk.add((end, rdflib.RDF.type, self.faldo.ExactPosition))
-            self.graph_chunk.add((end, self.faldo.end, faldo_end))
+            self.graph_chunk.add((end, self.faldo.position, faldo_end))
 
             self.graph_chunk.add((begin, self.faldo.reference, faldo_reference))
+            self.graph_chunk.add((end, self.faldo.reference, faldo_reference))
 
             if faldo_strand:
-                self.graph_chunk.add((begin, self.faldo.strand, faldo_strand))
+                self.graph_chunk.add((begin, rdflib.RDF.type, faldo_strand))
+                self.graph_chunk.add((end, rdflib.RDF.type, faldo_strand))
 
             # Shortcut triple for faldo queries
             self.graph_chunk.add((entity, self.namespace_internal["faldoBegin"], faldo_start))
diff --git a/askomics/libaskomics/File.py b/askomics/libaskomics/File.py
index 3ab01700..ea32ea71 100644
--- a/askomics/libaskomics/File.py
+++ b/askomics/libaskomics/File.py
@@ -464,7 +464,7 @@ def get_reference_strand_uri(self, reference, strand, block=None):
             self.faldo.ReverseStrandPosition: "ReverseStrand",
             self.faldo.BothStrandPosition: "BothStrand"
         }
-        if block is not None:
+        if block is None:
             if strand == self.faldo.BothStrandPosition:
                 return [self.rdfize(self.format_uri("{}_s{}s".format(reference, dstrand))) for dstrand in faldo_dict.values()]
             return [self.rdfize(self.format_uri("{}_s{}".format(reference, faldo_dict[strand])))]