diff --git a/docs/note.txt b/docs/note.txt
index 259ef10..773a81b 100644
--- a/docs/note.txt
+++ b/docs/note.txt
@@ -19,7 +19,7 @@ cwb-encode -d /corpora/data/utopien \
            -sxB \
            -R /usr/local/share/cwb/registry/utopien \
            -P lemma -P pos -P sem/ \
-           -S text:0+title -S s \
+           -S entry:0+author+title -S s \
            -0 corpus
 cwb-make -V UTOPIEN
 cwb-describe-corpus UTOPIEN
diff --git a/files/utopien.vrt b/files/utopien.vrt
index d232827..ddca683 100644
--- a/files/utopien.vrt
+++ b/files/utopien.vrt
@@ -118559,7 +118559,7 @@ new	new	JJ	|T3-|
 eBooks	ebook	NN2	|Q4.1/Y2|
 .	PUNC	YSTP	|PUNC|
 </s>
-</text>
+</entry>
 <entry title="1984" author="george_orwell">
 <s>
 1984	1984	MC	|N1|T1.2|T3|
@@ -251364,7 +251364,7 @@ as	as	CSA	|Z5|
 2050.	2050.	MC	|N1|T1.2|T3|
 393	393	MC	|N1|T1.2|T3|
 </s>
-</text>
+</entry>
 <entry title="pictures_of_a_socialistic_future" author="eugen_richter">
 <s>
 PICTURES	picture	NN2	|C1|Q4.3|X4.1|
@@ -296906,7 +296906,7 @@ brother	brother	NN1	|S4m|S2.2m|S9/S2.2m|
 ERNST	ernst	NP1	|Z99|
 .	PUNC	YSTP	|PUNC|
 </s>
-</text>
+</entry>
 <entry title="ecotopia" author="ernest_callenbach">
 <s>
 Ernest	ernest	NP1	|Z1m|
@@ -382647,7 +382647,7 @@ home	home	RL	|H4|M6|
 <s>
 WILL	will	VM	|T1.1.3|
 </s>
-</text>
+</entry>
 <entry title="kallocain" author="karin_boye">
 <s>
 KALLOCAIN	kallocain	VV0	|Z99|
@@ -462031,7 +462031,7 @@ PAIPHO	paipho	NN1	|Z99|
 ,	PUNC	YCOM	|PUNC|
 Censor	censor	VV0	|Q4/S7.4-|
 </s>
-</text>
+</entry>
 <entry title="clockwork_orange" author="anthony_burgess">
 <s>
 SHEPHERD	shepherd	NP1	|F4/S2mf|
@@ -472855,7 +472855,7 @@ s	s	ZZ1	|Z5|
 not	not	XX	|Z6|
 be	be	VBI	|A3+|Z5|
 </s>
-</text>
+</entry>
 <entry title="shovel_ready" author="adam_sternberg">
 <s>
 Every	every	AT1	|N5.1+|
@@ -479321,7 +479321,7 @@ curse	curse	VV0	|Q2.2|A1.4-|
 <s>
 Goddamn	goddamn	UH	|Z99|
 </s>
-</text>
+</entry>
 <entry title="utopia" author="thomas_moore">
 <s>
 The	the	AT	|Z5|
@@ -534793,7 +534793,7 @@ new	new	JJ	|T3-|
 eBooks	ebook	NN2	|Q4.1/Y2|
 .	PUNC	YSTP	|PUNC|
 </s>
-</text>
+</entry>
 <entry title="neuromancer" author="william_gibson">
 <s>
 Neuromancer	neuromancer	NP1	|Z99|
@@ -651294,7 +651294,7 @@ know	know	VV0	|X2.2+|S3.2/B1%|
 why	why	RRQ	|A2.2|
 .	PUNC	YSTP	|PUNC|
 </s>
-</text>
+</entry>
 <entry title="memoirs_of_the_year_2500" author="mercier">
 <s>
 Introduction	introduction	NN1	|T2+|Q4|S1.1.1|
@@ -720472,7 +720472,7 @@ patiently	patiently	RR	|E3+|
 and	and	CC	|Z5|
 even	even	RR	|A13.1|
 </s>
-</text>
+</entry>
 <entry title="the_american" author="henry_thomas">
 <s>
 The	the	AT	|Z5|
@@ -906269,7 +906269,7 @@ new	new	JJ	|T3-|
 eBooks	ebook	NN2	|Q4.1/Y2|
 .	PUNC	YSTP	|PUNC|
 </s>
-</text>
+</entry>
 <entry title="rise_of_the_meritocracy" author="michael_young">
 <s>
 The	the	AT	|Z5|
@@ -922465,7 +922465,7 @@ E	e	ZZ1	|Z5|
 i0%	i0%	FO	|Z99|
 i	i	ZZ1	|Z5|
 </s>
-</text>
+</entry>
 <entry title="fahrenheit_451" author="ray_bradbury">
 <s>
 FAHRENHEIT	fahrenheit	NP1	|Z99|
@@ -988287,7 +988287,7 @@ city	city	NN1	|M7c|M7/I2.1c|
 THE	the	AT	|Z5|
 END	end	NN1	|M6|T2-|O2|
 </s>
-</text>
+</entry>
 <entry title="looking_backward" author="edward_bellamy">
 <s>
 The	the	AT	|Z5|
@@ -1093741,7 +1093741,7 @@ new	new	JJ	|T3-|
 eBooks	ebook	NN2	|Q4.1/Y2|
 .	PUNC	YSTP	|PUNC|
 </s>
-</text>
+</entry>
 <entry title="i_robot" author="isaac_asimov">
 <s>
 I	i	PPIS1	|Z8mf|
@@ -1188343,7 +1188343,7 @@ eighty-two.	eighty-two.	JJ	|Z99|
 end	end	NN1	|M6|T2-|O2|
 ----	----	NN1	|Z99|
 </s>
-</text>
+</entry>
 <entry title="do_androids_dream_of_electric_sheep" author="philipp_k_dick">
 <s>
 Do	do	VD0	|A1.1.1|G2.2-|X9.2+|
@@ -1279300,7 +1279300,7 @@ hot	hot	JJ	|O4.6+|X9.1+|O4.2+|
 coffee	coffee	NN1	|F2|
 .	PUNC	YSTP	|PUNC|
 </s>
-</text>
+</entry>
 <entry title="we" author="jewgnij_samjatin">
 <s>
 RECORD	record	VV0	|Q1.2|K3|
@@ -1364769,7 +1364769,7 @@ must	must	VM	|S6+|A7+|
 prevail	prevail	VVI	|X9.2+|S7.1+|
 .	PUNC	YSTP	|PUNC|
 </s>
-</text>
+</entry>
 <entry title="news_from_nowhere" author="william_morris">
 <s>
 Project	project	NP1	|A10+|X7+|X2.6+|
@@ -1464182,7 +1464182,7 @@ by	by	II	|Z5|
 William	william	NP1	|Z1m|
 Morris	morris	NP1	|Z1mf|
 </s>
-</text>
+</entry>
 <entry title="erewhon" author="samuel_butler">
 <s>
 The	the	AT	|Z5|
@@ -1566446,7 +1566446,7 @@ new	new	JJ	|T3-|
 eBooks	ebook	NN2	|Q4.1/Y2|
 .	PUNC	YSTP	|PUNC|
 </s>
-</text>
+</entry>
 <entry title="new_atlantis" author="francis_bacon">
 <s>
 The	the	AT	|Z5|
@@ -1588245,7 +1588245,7 @@ by	by	II	|Z5|
 Francis	francis	NP1	|Z1m|
 Bacon	bacon	NP1	|F1|
 </s>
-</text>
+</entry>
 <entry title="a_logic_named_joe" author="murray_leinster">
 <s>
 A	a	AT1	|Z5|
@@ -1597348,7 +1597348,7 @@ hand	hand	NN1	|Z4|
 ,	PUNC	YCOM	|PUNC|
 maybe	maybe	RR	|A7|
 </s>
-</text>
+</entry>
 <entry title="the_last_man" author="mary_shelly">
 <s>
 The	the	AT	|Z5|
@@ -1817594,7 +1817594,7 @@ FULL	full	JJ	|N5.1+|I3.2+|
 LICENSE	license	NN1	|G1.1/Q1.2|S7.4+|
 ***	***	FO	|Z99|
 </s>
-</text>
+</entry>
 <entry title="player_piano" author="kurt_vonnegut">
 <s>
 CONSIDER	consider	VV0	|X2.1|X2.4|X6|
@@ -1957007,7 +1957007,7 @@ Forward	forward	JJ	|M6|A5.1+/A2.1|S1.2.3+|
 March	march	NPM1	|T1.3|
 .	PUNC	YSTP	|PUNC|
 </s>
-</text>
+</entry>
 <entry title="brave_new_world" author="aldous_huxley">
 <s>
 BRAVE	brave	JJ	|E5+|
@@ -2048148,5 +2048148,5 @@ east	east	ND1	|M6|
 .	PUNC	YSTP	|PUNC|
 ...	PUNC	YLIP	|PUNC|
 </s>
-</text>
+</entry>
 </corpus>