accurator/commit

Minor bug fixes (yeah, most informative commit eva).

diff --git a/lib/accurator/annotation.pl b/lib/accurator/annotation.pl
index 7acf9ca..0f4c75e 100644
--- a/lib/accurator/annotation.pl
+++ b/lib/accurator/annotation.pl
@@ -115,7 +115,8 @@ annotations(object, Uri, Annotations) :-
 		     body:NiceBody},
 	    (	get_annotation(Uri, AnnotationBody, AnnotationHash),
 			process_annotation(AnnotationBody, NiceBody),
-			rdf(AnnotationHash, ann_ui:annotationField, FieldUri),
+			% use rdf_has to also include fragment and whole fields
+			rdf_has(AnnotationHash, auis:fields, FieldUri),
 			rdf_display_label(FieldUri, _, FieldLabel)
 	    ),
 	    FoundAnnotations),
diff --git a/rdf/ui/labels_schema.ttl b/rdf/ui/labels_schema.ttl
index 3474198..a4bca3b 100644
--- a/rdf/ui/labels_schema.ttl
+++ b/rdf/ui/labels_schema.ttl
@@ -37,10 +37,12 @@ auis:fields a rdf:Property ;
 	rdfs:comment "Property for connecting annotation UI to included fields"@en .
 
 auis:fragmentFields a rdf:Property ;
+	rdfs:subPropertyOf auis:fields ;
 	rdfs:label "Fields for fragments"@en ;
 	rdfs:comment "Property for connecting fields for describing fragments of media."@en .
 
 auis:wholeFields a rdf:Property ;
+	rdfs:subPropertyOf auis:fields ;
 	rdfs:label "Fields for describing whole things"@en ;
 	rdfs:comment "Property for connecting annotation UI to include fields that describe whole things."@en .
 
diff --git a/rdf/void.ttl b/rdf/void.ttl
index e4cd4c8..a3ce64f 100644
--- a/rdf/void.ttl
+++ b/rdf/void.ttl
@@ -36,7 +36,7 @@
 				<accurator-ui-schema> ,
 				<accurator-ui> ,
 				<accurator-ui-countries> ,
-				<accurator-ui-languages> ,
+				<accurator-ui-languages> ;
 	dcterms:title "Generic Accurator configuration" ;
 	void:dataDump <domain/domain.ttl> .
 
@@ -57,7 +57,7 @@
 	a void:Dataset ;
 	dcterms:title "Accurator configuration for bible domain" ;
 	void:dataDump <domain/bible/bible_domain.ttl> ,
-				  <domain/bible/concept_scheme_bible_figure.ttl> ;
+				  <domain/bible/concept_scheme_bible_figure.ttl> ,
 				  <domain/bible/concept_scheme_bible_theme.ttl> ;
 	void:subset <accurator-ui-bible> .
 
diff --git a/web/html/item.html b/web/html/item.html
index 6e1d537..9cbea17 100644
--- a/web/html/item.html
+++ b/web/html/item.html
@@ -123,7 +123,7 @@
 	<script type="text/javascript" src="js/typeahead.js"></script>
 	<script type="text/javascript" src="js/search.js"></script>
 	<script type="text/javascript" src="js/accurator_utilities.js"></script>
-	<script type="text/javascript" src="js/accurator_annotate.js"></script>
-	<script>annotateInit()</script>
+	<script type="text/javascript" src="js/accurator_item.js"></script>
+	<script>itemInit()</script>
 </body>
 </html>
diff --git a/web/js/accurator_item.js b/web/js/accurator_item.js
index fb69c95..21e59b6 100644
--- a/web/js/accurator_item.js
+++ b/web/js/accurator_item.js
@@ -10,7 +10,7 @@ displayOptions = {
 	showAnnotations: true,
 }
 
-function annotateInit() {
+function itemInit() {
 	locale = getLocale();
 	domain = getDomain();
 	experiment = getExperiment();