From f1200fd1cab4fa57feacd43046997ce2d23edbd5 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 17 Sep 2012 12:54:28 +0200
Subject: [PATCH] Tweak rank/relevance algorithm

Rank algorithm configurable by 'rank' element inside service. So far
only, attribute 'cluster' is recognized. If cluster="yes", multiple
records inside a cluster boosts higher than single records. This
is default behavior and existing behavior. cluster="no" takes the
average score of each record in a cluster.
---
 NEWS                            |    7 +++++++
 doc/pazpar2_conf.xml            |   16 ++++++++++++++++
 src/client.c                    |    3 ++-
 src/pazpar2_config.c            |   16 ++++++++++++++++
 src/pazpar2_config.h            |    1 +
 src/relevance.c                 |   29 +++++++++++++++++-----------
 src/relevance.h                 |    3 ++-
 test/test_facets_13.res         |    2 +-
 test/test_facets_16.res         |    2 +-
 test/test_facets_24.res         |   14 +++++++-------
 test/test_facets_4.res          |   10 +++++-----
 test/test_facets_9.res          |    2 +-
 test/test_filter_12.res         |   22 ++++++++++-----------
 test/test_filter_3.res          |   22 ++++++++++-----------
 test/test_filter_6.res          |   10 +++++-----
 test/test_filter_9.res          |   10 +++++-----
 test/test_http.cfg              |    1 +
 test/test_http_18.res           |    2 +-
 test/test_http_28.res           |    6 +++---
 test/test_http_32.res           |    2 +-
 test/test_http_36.res           |   14 +++++++-------
 test/test_http_42.res           |   10 +++++-----
 test/test_http_49.res           |    2 +-
 test/test_http_5.res            |   16 ++++++++--------
 test/test_http_60.res           |    2 +-
 test/test_http_63.res           |    2 +-
 test/test_http_66.res           |    2 +-
 test/test_http_72.res           |    2 +-
 test/test_http_74.res           |    2 +-
 test/test_http_76.res           |    6 +++---
 test/test_http_79.res           |    4 ++--
 test/test_http_81.res           |    2 +-
 test/test_icu_9.res             |   16 ++++++++--------
 test/test_limit_limitmap_15.res |    2 +-
 test/test_limit_limitmap_18.res |    2 +-
 test/test_limit_limitmap_21.res |    2 +-
 test/test_limit_limitmap_24.res |    2 +-
 test/test_limit_limitmap_26.res |    6 +++---
 test/test_limit_limitmap_28.res |    2 +-
 test/test_limit_limitmap_30.res |    6 +++---
 test/test_limit_limitmap_36.res |    6 +++---
 test/test_limit_limitmap_4.res  |   16 ++++++++--------
 test/test_limit_limitmap_42.res |    6 +++---
 test/test_limit_limitmap_9.res  |   40 +++++++++++++++++++--------------------
 test/test_post_10.res           |   16 ++++++++--------
 test/test_post_8.res            |   16 ++++++++--------
 test/test_solr_13.res           |   40 +++++++++++++++++++--------------------
 test/test_solr_18.res           |   40 +++++++++++++++++++--------------------
 test/test_solr_22.res           |    4 ++--
 test/test_solr_25.res           |   40 +++++++++++++++++++--------------------
 test/test_solr_29.res           |    4 ++--
 test/test_solr_4.res            |   40 +++++++++++++++++++--------------------
 test/test_solr_9.res            |   40 +++++++++++++++++++--------------------
 test/test_termlist_block_9.res  |   40 +++++++++++++++++++--------------------
 test/test_turbomarcxml_4.res    |    2 +-
 test/test_turbomarcxml_7.res    |    2 +-
 test/test_url_3.res             |   16 ++++++++--------
 test/test_url_6.res             |    4 ++--
 58 files changed, 352 insertions(+), 302 deletions(-)

diff --git a/NEWS b/NEWS
index 5cbf7a5..c513062 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+
+Rank algorithm configurable by 'rank' element inside service. So far
+only, attribute 'cluster' is recognized. If cluster="yes", multiple
+records inside a cluster boosts higher than single records. This
+is default behavior and existing behavior. cluster="no" takes the
+average score of each record in a cluster.
+
 --- 1.6.17 2012/09/05
 
 Fix bad re-use of connections (connections with changing proxy should not
diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 913c753..454cc02 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -581,6 +581,22 @@
 	</listitem>
        </varlistentry>
 
+       <varlistentry>
+	<term>rank</term>
+	<listitem>
+	 <para>
+	  Customizes the ranking (relevance) algorithm.
+	  Attribute 'cluster' is a boolean
+	  that controls whether Pazpar2 should boost ranking for merged
+	  records. Is 'yes' by default. A value of 'no' will make
+	  Pazpar2 avergage ranking of each record in a cluster.
+	 </para>
+	 <para>
+	  This configuration was added in pazpar2 1.6.18.
+	 </para>
+	</listitem>
+       </varlistentry>
+
 <!--       
        <varlistentry>
 	<term>set</term>
diff --git a/src/client.c b/src/client.c
index efdd7cd..3578173 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1301,7 +1301,8 @@ int client_parse_query(struct client *cl, const char *query,
     if (!se->relevance)
     {
         // Initialize relevance structure with query terms
-        se->relevance = relevance_create_ccl(se->service->charsets, cn);
+        se->relevance = relevance_create_ccl(se->service->charsets, cn,
+                                             se->service->rank_cluster);
     }
     ccl_rpn_delete(cn);
     return ret_value;
diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index f0e395f..b45d8ec 100644
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -132,6 +132,7 @@ struct conf_service *service_init(struct conf_server *server,
     service->session_timeout = 60; /* default session timeout */
     service->z3950_session_timeout = 180;
     service->z3950_operation_timeout = 30;
+    service->rank_cluster = 1;
 
     service->charsets = 0;
 
@@ -613,6 +614,21 @@ static struct conf_service *service_create_static(struct conf_server *server,
                 //service_aply_setting(service, name, value);
             }
         }
+        else if (!strcmp((const char *) n->name, "rank"))
+        {
+            char *rank_cluster = (char *) xmlGetProp(n, (xmlChar *) "cluster");
+
+            if (rank_cluster && !strcmp(rank_cluster, "yes"))
+                service->rank_cluster = 1;
+            else if (rank_cluster && !strcmp(rank_cluster, "no"))
+                service->rank_cluster = 0;
+            else
+            {
+                yaz_log(YLOG_FATAL, "service: rank@cluster boolean");
+                return 0;
+            }
+            xmlFree(rank_cluster);
+        }
         else
         {
             yaz_log(YLOG_FATAL, "Bad element: %s", n->name);
diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 5eb9c5e..42e7c03 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -116,6 +116,7 @@ struct conf_service
     int session_timeout;
     int z3950_session_timeout;
     int z3950_operation_timeout;
+    int rank_cluster;
 
     int ref_count;
     /* duplicated from conf_server */
diff --git a/src/relevance.c b/src/relevance.c
index bc9cb1a..b9fc0e1 100644
--- a/src/relevance.c
+++ b/src/relevance.c
@@ -34,6 +34,7 @@ struct relevance
     int vec_len;
     struct word_entry *entries;
     pp2_charset_token_t prt;
+    int rank_cluster;
     NMEM nmem;
 };
 
@@ -147,7 +148,8 @@ static void pull_terms(struct relevance *res, struct ccl_rpn_node *n)
 }
 
 struct relevance *relevance_create_ccl(pp2_charset_fact_t pft,
-                                       struct ccl_rpn_node *query)
+                                       struct ccl_rpn_node *query,
+                                       int rank_cluster)
 {
     NMEM nmem = nmem_create();
     struct relevance *res = nmem_malloc(nmem, sizeof(*res));
@@ -156,6 +158,7 @@ struct relevance *relevance_create_ccl(pp2_charset_fact_t pft,
     res->nmem = nmem;
     res->entries = 0;
     res->vec_len = 1;
+    res->rank_cluster = rank_cluster;
     res->prt = pp2_charset_token_create(pft, "relevance");
     
     pull_terms(res, query);
@@ -228,15 +231,9 @@ void relevance_prepare_read(struct relevance *rel, struct reclist *reclist)
             idfvec[i] = 0;
         else
         {
-            // This conditional may be terribly wrong
-            // It was there to address the situation where vec[0] == vec[i]
-            // which leads to idfvec[i] == 0... not sure about this
-            // Traditional TF-IDF may assume that a word that occurs in every
-            // record is irrelevant, but this is actually something we will
-            // see a lot
-            if ((idfvec[i] = log((float) rel->doc_frequency_vec[0] /
-                            rel->doc_frequency_vec[i])) < 0.0000001)
-                idfvec[i] = 1;
+            /* add one to nominator idf(t,D) to ensure a value > 0 */
+            idfvec[i] = log((float) (1 + rel->doc_frequency_vec[0]) /
+                            rel->doc_frequency_vec[i]);
         }
     }
     // Calculate relevance for each document
@@ -250,7 +247,17 @@ void relevance_prepare_read(struct relevance *rel, struct reclist *reclist)
         for (t = 1; t < rel->vec_len; t++)
         {
             float termfreq = (float) rec->term_frequency_vecf[t];
-            relevance += 100000 * (termfreq * idfvec[t] + 0.0000005);  
+            relevance += 100000 * termfreq * idfvec[t];
+        }
+        if (!rel->rank_cluster)
+        {
+            struct record *record;
+            int cluster_size = 0;
+
+            for (record = rec->records; record; record = record->next)
+                cluster_size++;
+            
+            relevance /= cluster_size;
         }
         rec->relevance_score = relevance;
     }
diff --git a/src/relevance.h b/src/relevance.h
index 35949c0..c2ffa4a 100644
--- a/src/relevance.h
+++ b/src/relevance.h
@@ -29,7 +29,8 @@ struct record_cluster;
 struct reclist;
 
 struct relevance *relevance_create_ccl(pp2_charset_fact_t pft,
-                                       struct ccl_rpn_node *query);
+                                       struct ccl_rpn_node *query,
+                                       int rank_cluster);
 void relevance_destroy(struct relevance **rp);
 void relevance_newrec(struct relevance *r, struct record_cluster *cluster);
 void relevance_countwords(struct relevance *r, struct record_cluster *cluster,
diff --git a/test/test_facets_13.res b/test/test_facets_13.res
index 81bb1ea..bbb5448 100644
--- a/test/test_facets_13.res
+++ b/test/test_facets_13.res
@@ -17,7 +17,7 @@
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>240000</relevance>
+<relevance>97311</relevance>
 <recid>content: title how to program a computer author jack collins</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_facets_16.res b/test/test_facets_16.res
index b42b13e..29137c8 100644
--- a/test/test_facets_16.res
+++ b/test/test_facets_16.res
@@ -17,7 +17,7 @@
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>240000</relevance>
+<relevance>97311</relevance>
 <recid>content: title how to program a computer author jack collins</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_facets_24.res b/test/test_facets_24.res
index 2048b77..0e3a51d 100644
--- a/test/test_facets_24.res
+++ b/test/test_facets_24.res
@@ -17,7 +17,7 @@
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>28267</relevance>
+<relevance>53554</relevance>
 <recid>content: title how to program a computer author jack collins</recid>
 </hit>
 <hit>
@@ -29,7 +29,7 @@
 <md-title>Computer science &amp; technology</md-title>
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date></location>
-<relevance>23556</relevance>
+<relevance>44628</relevance>
 <recid>content: title computer science technology</recid>
 </hit>
 <hit>
@@ -42,7 +42,7 @@
 <md-date>1973-1980</md-date>
 <md-description>Hebrew and Greek; introductions in English</md-description>
 <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description></location>
-<relevance>23556</relevance>
+<relevance>44628</relevance>
 <recid>content: title the computer bible</recid>
 </hit>
 <hit>
@@ -58,7 +58,7 @@
 <md-date>1971</md-date>
 <md-author>Englund, Carl R</md-author>
 <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description></location>
-<relevance>10095</relevance>
+<relevance>19126</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r</recid>
 </hit>
 <hit>
@@ -74,7 +74,7 @@
 <md-date>1974</md-date>
 <md-author>Mairs, John W</md-author>
 <md-description>Scale of maps ca. 1:1,000,000</md-description></location>
-<relevance>9815</relevance>
+<relevance>18595</relevance>
 <recid>content: title the puget sound region author mairs john w</recid>
 </hit>
 <hit>
@@ -86,7 +86,7 @@
 <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
 <md-title-remainder>the proceedings of a workshop</md-title-remainder>
 <md-date>1974</md-date></location>
-<relevance>7067</relevance>
+<relevance>13388</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera</recid>
 </hit>
 <hit>
@@ -98,7 +98,7 @@
 <md-title>The use of passwords for controlled access to computer resources</md-title>
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author></location>
-<relevance>7067</relevance>
+<relevance>13388</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m</recid>
 </hit>
 <hit>
diff --git a/test/test_facets_4.res b/test/test_facets_4.res
index 0e88890..c3bcbb2 100644
--- a/test/test_facets_4.res
+++ b/test/test_facets_4.res
@@ -17,7 +17,7 @@
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>36996</relevance>
+<relevance>69043</relevance>
 <recid>content: title how to program a computer author jack collins</recid>
 </hit>
 <hit>
@@ -29,7 +29,7 @@
 <md-title>Computer science &amp; technology</md-title>
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date></location>
-<relevance>30830</relevance>
+<relevance>57536</relevance>
 <recid>content: title computer science technology</recid>
 </hit>
 <hit>
@@ -42,7 +42,7 @@
 <md-date>1973-1980</md-date>
 <md-description>Hebrew and Greek; introductions in English</md-description>
 <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description></location>
-<relevance>30830</relevance>
+<relevance>57536</relevance>
 <recid>content: title the computer bible</recid>
 </hit>
 <hit>
@@ -58,7 +58,7 @@
 <md-date>1974</md-date>
 <md-author>Mairs, John W</md-author>
 <md-description>Scale of maps ca. 1:1,000,000</md-description></location>
-<relevance>12845</relevance>
+<relevance>23973</relevance>
 <recid>content: title the puget sound region author mairs john w</recid>
 </hit>
 <hit>
@@ -70,7 +70,7 @@
 <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
 <md-title-remainder>the proceedings of a workshop</md-title-remainder>
 <md-date>1974</md-date></location>
-<relevance>9249</relevance>
+<relevance>17260</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera</recid>
 </hit>
 <hit>
diff --git a/test/test_facets_9.res b/test/test_facets_9.res
index 4724806..24568bc 100644
--- a/test/test_facets_9.res
+++ b/test/test_facets_9.res
@@ -17,7 +17,7 @@
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>240000</relevance>
+<relevance>97311</relevance>
 <recid>content: title how to program a computer author jack collins</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_filter_12.res b/test/test_filter_12.res
index 0f10df7..9d1eadd 100644
--- a/test/test_filter_12.res
+++ b/test/test_filter_12.res
@@ -26,7 +26,7 @@
 <md-subject>Leno, Jay</md-subject>
 <md-subject>Talk shows</md-subject>
 <md-description tag="500">Includes index</md-description></location>
-<relevance>27070</relevance>
+<relevance>51972</relevance>
 <recid>content: title the late shift author carter bill medium book</recid>
 </hit>
 <hit>
@@ -43,7 +43,7 @@
 <md-subject>Bible</md-subject>
 <md-description tag="500">Hebrew and Greek; introductions in English</md-description>
 <md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description></location>
-<relevance>17402</relevance>
+<relevance>33410</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -64,7 +64,7 @@
 <md-subject>Greece</md-subject>
 <md-description tag="500">Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
 <md-description tag="504">Includes bibliographical references</md-description></location>
-<relevance>15187</relevance>
+<relevance>29158</relevance>
 <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 <hit>
@@ -85,7 +85,7 @@
 <md-subject>Puget Sound region (Wash.)</md-subject>
 <md-description tag="500">Scale of maps ca. 1:1,000,000</md-description>
 <md-description tag="504">Bibliography: p. 4</md-description></location>
-<relevance>13051</relevance>
+<relevance>25058</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -101,7 +101,7 @@
 <md-date>1977</md-date>
 <md-subject>Tomography</md-subject>
 <md-description tag="504">Includes bibliographical references and index</md-description></location>
-<relevance>10876</relevance>
+<relevance>20881</relevance>
 <recid>content: title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book</recid>
 </hit>
 <hit>
@@ -121,7 +121,7 @@
 <md-subject>Scintillation cameras</md-subject>
 <md-subject>Imaging systems in medicine</md-subject>
 <md-description tag="504">Includes bibliographical references and index</md-description></location>
-<relevance>8701</relevance>
+<relevance>16705</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
@@ -140,7 +140,7 @@
 <md-subject>Dropouts</md-subject>
 <md-description tag="533">Microfiche</md-description>
 <md-description tag="500">Distributed to depository libraries in microfiche</md-description></location>
-<relevance>7251</relevance>
+<relevance>13921</relevance>
 <recid>content: title dealing with dropouts author paulu nancy medium</recid>
 </hit>
 <hit>
@@ -159,7 +159,7 @@
 <md-subject>Handicapped children</md-subject>
 <md-description tag="533">Microfiche</md-description>
 <md-description tag="500">Distributed to depository libraries in microfiche</md-description></location>
-<relevance>6960</relevance>
+<relevance>13364</relevance>
 <recid>content: title national dissemination model for the i m special program of physical education for the handicapped author medium</recid>
 </hit>
 <hit>
@@ -173,7 +173,7 @@
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author>
 <md-subject>Computers</md-subject></location>
-<relevance>5220</relevance>
+<relevance>10023</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
@@ -187,7 +187,7 @@
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date>
 <md-subject>Optical pattern recognition</md-subject></location>
-<relevance>3107</relevance>
+<relevance>5966</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
@@ -209,7 +209,7 @@
 <md-description tag="500">Distributed to depository libraries in microfiche</md-description>
 <md-description tag="500">&quot;December 1984.&quot;</md-description>
 <md-description tag="500">Includes indexes</md-description></location>
-<relevance>1740</relevance>
+<relevance>3341</relevance>
 <recid>content: title technology programs that work author medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_filter_3.res b/test/test_filter_3.res
index 832dc9c..2b390e9 100644
--- a/test/test_filter_3.res
+++ b/test/test_filter_3.res
@@ -26,7 +26,7 @@
 <md-subject>Leno, Jay</md-subject>
 <md-subject>Talk shows</md-subject>
 <md-description tag="500">Includes index</md-description></location>
-<relevance>27070</relevance>
+<relevance>51972</relevance>
 <recid>content: title the late shift author carter bill medium book</recid>
 </hit>
 <hit>
@@ -43,7 +43,7 @@
 <md-subject>Bible</md-subject>
 <md-description tag="500">Hebrew and Greek; introductions in English</md-description>
 <md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description></location>
-<relevance>17402</relevance>
+<relevance>33410</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -64,7 +64,7 @@
 <md-subject>Greece</md-subject>
 <md-description tag="500">Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
 <md-description tag="504">Includes bibliographical references</md-description></location>
-<relevance>15187</relevance>
+<relevance>29158</relevance>
 <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 <hit>
@@ -85,7 +85,7 @@
 <md-subject>Puget Sound region (Wash.)</md-subject>
 <md-description tag="500">Scale of maps ca. 1:1,000,000</md-description>
 <md-description tag="504">Bibliography: p. 4</md-description></location>
-<relevance>13051</relevance>
+<relevance>25058</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -101,7 +101,7 @@
 <md-date>1977</md-date>
 <md-subject>Tomography</md-subject>
 <md-description tag="504">Includes bibliographical references and index</md-description></location>
-<relevance>10876</relevance>
+<relevance>20881</relevance>
 <recid>content: title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book</recid>
 </hit>
 <hit>
@@ -121,7 +121,7 @@
 <md-subject>Scintillation cameras</md-subject>
 <md-subject>Imaging systems in medicine</md-subject>
 <md-description tag="504">Includes bibliographical references and index</md-description></location>
-<relevance>8701</relevance>
+<relevance>16705</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
@@ -140,7 +140,7 @@
 <md-subject>Dropouts</md-subject>
 <md-description tag="533">Microfiche</md-description>
 <md-description tag="500">Distributed to depository libraries in microfiche</md-description></location>
-<relevance>7251</relevance>
+<relevance>13921</relevance>
 <recid>content: title dealing with dropouts author paulu nancy medium</recid>
 </hit>
 <hit>
@@ -159,7 +159,7 @@
 <md-subject>Handicapped children</md-subject>
 <md-description tag="533">Microfiche</md-description>
 <md-description tag="500">Distributed to depository libraries in microfiche</md-description></location>
-<relevance>6960</relevance>
+<relevance>13364</relevance>
 <recid>content: title national dissemination model for the i m special program of physical education for the handicapped author medium</recid>
 </hit>
 <hit>
@@ -173,7 +173,7 @@
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author>
 <md-subject>Computers</md-subject></location>
-<relevance>5220</relevance>
+<relevance>10023</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
@@ -187,7 +187,7 @@
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date>
 <md-subject>Optical pattern recognition</md-subject></location>
-<relevance>3107</relevance>
+<relevance>5966</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
@@ -209,7 +209,7 @@
 <md-description tag="500">Distributed to depository libraries in microfiche</md-description>
 <md-description tag="500">&quot;December 1984.&quot;</md-description>
 <md-description tag="500">Includes indexes</md-description></location>
-<relevance>1740</relevance>
+<relevance>3341</relevance>
 <recid>content: title technology programs that work author medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_filter_6.res b/test/test_filter_6.res
index 07bccc8..8aa054d 100644
--- a/test/test_filter_6.res
+++ b/test/test_filter_6.res
@@ -19,7 +19,7 @@
 <md-subject>Bible</md-subject>
 <md-description tag="500">Hebrew and Greek; introductions in English</md-description>
 <md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description></location>
-<relevance>67294</relevance>
+<relevance>94000</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -40,7 +40,7 @@
 <md-subject>Puget Sound region (Wash.)</md-subject>
 <md-description tag="500">Scale of maps ca. 1:1,000,000</md-description>
 <md-description tag="504">Bibliography: p. 4</md-description></location>
-<relevance>50470</relevance>
+<relevance>70500</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -56,7 +56,7 @@
 <md-date>1977</md-date>
 <md-subject>Tomography</md-subject>
 <md-description tag="504">Includes bibliographical references and index</md-description></location>
-<relevance>42059</relevance>
+<relevance>58750</relevance>
 <recid>content: title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book</recid>
 </hit>
 <hit>
@@ -76,7 +76,7 @@
 <md-subject>Scintillation cameras</md-subject>
 <md-subject>Imaging systems in medicine</md-subject>
 <md-description tag="504">Includes bibliographical references and index</md-description></location>
-<relevance>33647</relevance>
+<relevance>47000</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
@@ -90,7 +90,7 @@
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date>
 <md-subject>Optical pattern recognition</md-subject></location>
-<relevance>12016</relevance>
+<relevance>16785</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_filter_9.res b/test/test_filter_9.res
index 07bccc8..8aa054d 100644
--- a/test/test_filter_9.res
+++ b/test/test_filter_9.res
@@ -19,7 +19,7 @@
 <md-subject>Bible</md-subject>
 <md-description tag="500">Hebrew and Greek; introductions in English</md-description>
 <md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description></location>
-<relevance>67294</relevance>
+<relevance>94000</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -40,7 +40,7 @@
 <md-subject>Puget Sound region (Wash.)</md-subject>
 <md-description tag="500">Scale of maps ca. 1:1,000,000</md-description>
 <md-description tag="504">Bibliography: p. 4</md-description></location>
-<relevance>50470</relevance>
+<relevance>70500</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -56,7 +56,7 @@
 <md-date>1977</md-date>
 <md-subject>Tomography</md-subject>
 <md-description tag="504">Includes bibliographical references and index</md-description></location>
-<relevance>42059</relevance>
+<relevance>58750</relevance>
 <recid>content: title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book</recid>
 </hit>
 <hit>
@@ -76,7 +76,7 @@
 <md-subject>Scintillation cameras</md-subject>
 <md-subject>Imaging systems in medicine</md-subject>
 <md-description tag="504">Includes bibliographical references and index</md-description></location>
-<relevance>33647</relevance>
+<relevance>47000</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
@@ -90,7 +90,7 @@
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date>
 <md-subject>Optical pattern recognition</md-subject></location>
-<relevance>12016</relevance>
+<relevance>16785</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_http.cfg b/test/test_http.cfg
index 5e92e0c..df09619 100644
--- a/test/test_http.cfg
+++ b/test/test_http.cfg
@@ -9,6 +9,7 @@
       <ccldirective name="and" value="AND"/>
       <ccldirective name="or" value="OR"/>
       <ccldirective name="not" value="NOT"/>
+      <rank cluster="yes"/>
 
       <include src="z3950_indexdata_com_marc.xml"/>
 
diff --git a/test/test_http_18.res b/test/test_http_18.res
index 1179ede..7bf8d1f 100644
--- a/test/test_http_18.res
+++ b/test/test_http_18.res
@@ -15,7 +15,7 @@
 <md-description tag="513">1692-PRESENT</md-description>
 <md-test-usersetting-2>test-usersetting-2 data: 
 </md-test-usersetting-2></location>
-<relevance>9416</relevance>
+<relevance>11882</relevance>
 <recid>content: title bibliography of maine geology author medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_http_28.res b/test/test_http_28.res
index 848119e..77035ab 100644
--- a/test/test_http_28.res
+++ b/test/test_http_28.res
@@ -10,7 +10,7 @@
 <md-title>UTAH GEOCHROMOMETRY</md-title><location id="z3950.indexdata.com/gils"
  name="Index Data GILS test server" checksum="2074161109">
 <md-title>UTAH GEOCHROMOMETRY</md-title></location>
-<relevance>300000</relevance>
+<relevance>86304</relevance>
 <recid>content: title utah geochromometry author medium book</recid>
 </hit>
 <hit>
@@ -18,7 +18,7 @@
 <md-title>UTAH EARTHQUAKE EPICENTERS</md-title><location id="z3950.indexdata.com/gils"
  name="Index Data GILS test server" checksum="1725776531">
 <md-title>UTAH EARTHQUAKE EPICENTERS</md-title></location>
-<relevance>200000</relevance>
+<relevance>57536</relevance>
 <recid>content: title utah earthquake epicenters author medium book</recid>
 </hit>
 <hit>
@@ -26,7 +26,7 @@
 <md-title>UTAH GEOLOGICAL AND MINERAL SURVEY PUBLICATIONS</md-title><location id="z3950.indexdata.com/gils"
  name="Index Data GILS test server" checksum="1899968820">
 <md-title>UTAH GEOLOGICAL AND MINERAL SURVEY PUBLICATIONS</md-title></location>
-<relevance>100000</relevance>
+<relevance>28768</relevance>
 <recid>content: title utah geological and mineral survey publications author medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_http_32.res b/test/test_http_32.res
index 1a1a40b..5268bf3 100644
--- a/test/test_http_32.res
+++ b/test/test_http_32.res
@@ -12,7 +12,7 @@
  name="gils" checksum="2074161109">
 <md-title>BIBLIOGRAPHY OF MAINE GEOLOGY</md-title>
 <md-description>This data base is a computer based bibliography of marine geology.  It allows searching by topic and geographic location, similar to GEOREF.  It is currently under development to replace the printed Bibliography of Marine Geology</md-description></location>
-<relevance>9416</relevance>
+<relevance>11882</relevance>
 <recid>content: title bibliography of maine geology</recid>
 </hit>
 <hit>
diff --git a/test/test_http_36.res b/test/test_http_36.res
index 476a4e6..011d4fc 100644
--- a/test/test_http_36.res
+++ b/test/test_http_36.res
@@ -19,7 +19,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>26706</relevance>
+<relevance>50262</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
@@ -39,7 +39,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>26706</relevance>
+<relevance>50262</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -58,7 +58,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>11445</relevance>
+<relevance>21541</relevance>
 <recid>content: title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
@@ -79,7 +79,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>11445</relevance>
+<relevance>21541</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 <hit>
@@ -103,7 +103,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>11127</relevance>
+<relevance>20942</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -126,7 +126,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>8011</relevance>
+<relevance>15078</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
@@ -143,7 +143,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>8011</relevance>
+<relevance>15078</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_http_42.res b/test/test_http_42.res
index 9ff86ef..f0001db 100644
--- a/test/test_http_42.res
+++ b/test/test_http_42.res
@@ -26,7 +26,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>174545</relevance>
+<relevance>31823</relevance>
 <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 <hit>
@@ -50,7 +50,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>150000</relevance>
+<relevance>27348</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -69,7 +69,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>125000</relevance>
+<relevance>22790</relevance>
 <recid>content: title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book</recid>
 </hit>
 <hit>
@@ -86,7 +86,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>60000</relevance>
+<relevance>10939</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
@@ -103,7 +103,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>35714</relevance>
+<relevance>6511</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_http_49.res b/test/test_http_49.res
index 348baf0..a0046a5 100644
--- a/test/test_http_49.res
+++ b/test/test_http_49.res
@@ -26,7 +26,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>420000</relevance>
+<relevance>291121</relevance>
 <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_http_5.res b/test/test_http_5.res
index 23ee21f..f994402 100644
--- a/test/test_http_5.res
+++ b/test/test_http_5.res
@@ -23,7 +23,7 @@
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
 <count>2</count>
-<relevance>25286</relevance>
+<relevance>48160</relevance>
 <recid>content: title how to program a computer author jack collins medium book</recid>
 </hit>
 <hit>
@@ -40,7 +40,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>21072</relevance>
+<relevance>40134</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
@@ -60,7 +60,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>21072</relevance>
+<relevance>40134</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -79,7 +79,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
@@ -100,7 +100,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 <hit>
@@ -124,7 +124,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>8780</relevance>
+<relevance>16722</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -147,7 +147,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
@@ -164,7 +164,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_http_60.res b/test/test_http_60.res
index f836377..ea3a20e 100644
--- a/test/test_http_60.res
+++ b/test/test_http_60.res
@@ -26,7 +26,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>620000</relevance>
+<relevance>429749</relevance>
 <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_http_63.res b/test/test_http_63.res
index 348baf0..a0046a5 100644
--- a/test/test_http_63.res
+++ b/test/test_http_63.res
@@ -26,7 +26,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>420000</relevance>
+<relevance>291121</relevance>
 <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_http_66.res b/test/test_http_66.res
index 348baf0..a0046a5 100644
--- a/test/test_http_66.res
+++ b/test/test_http_66.res
@@ -26,7 +26,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>420000</relevance>
+<relevance>291121</relevance>
 <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_http_72.res b/test/test_http_72.res
index 348baf0..a0046a5 100644
--- a/test/test_http_72.res
+++ b/test/test_http_72.res
@@ -26,7 +26,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>420000</relevance>
+<relevance>291121</relevance>
 <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_http_74.res b/test/test_http_74.res
index 95379fe..9820ddf 100644
--- a/test/test_http_74.res
+++ b/test/test_http_74.res
@@ -23,7 +23,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>85714</relevance>
+<relevance>59412</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_http_76.res b/test/test_http_76.res
index 57983c5..59c4719 100644
--- a/test/test_http_76.res
+++ b/test/test_http_76.res
@@ -19,7 +19,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>57536</relevance>
+<relevance>102165</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
@@ -39,7 +39,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>57536</relevance>
+<relevance>102165</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -56,7 +56,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>17260</relevance>
+<relevance>30649</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_http_79.res b/test/test_http_79.res
index dda0a5b..0f44b56 100644
--- a/test/test_http_79.res
+++ b/test/test_http_79.res
@@ -26,7 +26,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>150000</relevance>
+<relevance>60819</relevance>
 <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 <hit>
@@ -48,7 +48,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>100000</relevance>
+<relevance>40546</relevance>
 <recid>content: title four psalms author smith george adam medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_http_81.res b/test/test_http_81.res
index cfa7ec5..ffaa7f0 100644
--- a/test/test_http_81.res
+++ b/test/test_http_81.res
@@ -26,7 +26,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>540000</relevance>
+<relevance>374298</relevance>
 <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_icu_9.res b/test/test_icu_9.res
index 778509c..2f16bf0 100644
--- a/test/test_icu_9.res
+++ b/test/test_icu_9.res
@@ -17,7 +17,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>37929</relevance>
+<relevance>72241</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
@@ -38,7 +38,7 @@
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
 <count>2</count>
-<relevance>25286</relevance>
+<relevance>48160</relevance>
 <recid>content: title how to program a computer author jack collins medium book</recid>
 </hit>
 <hit>
@@ -54,7 +54,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>21072</relevance>
+<relevance>40134</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -69,7 +69,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>15804</relevance>
+<relevance>30100</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
@@ -84,7 +84,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
@@ -103,7 +103,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 <hit>
@@ -123,7 +123,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>8780</relevance>
+<relevance>16722</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -140,7 +140,7 @@
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
 <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_limit_limitmap_15.res b/test/test_limit_limitmap_15.res
index df0075e..1bb23c0 100644
--- a/test/test_limit_limitmap_15.res
+++ b/test/test_limit_limitmap_15.res
@@ -17,7 +17,7 @@
 <md-author>Adam, James</md-author>
 <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>620000</relevance>
+<relevance>429749</relevance>
 <recid>content: title the religious teachers of greece author adam james</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_limit_limitmap_18.res b/test/test_limit_limitmap_18.res
index 8879b7f..0c2b760 100644
--- a/test/test_limit_limitmap_18.res
+++ b/test/test_limit_limitmap_18.res
@@ -17,7 +17,7 @@
 <md-author>Adam, James</md-author>
 <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>420000</relevance>
+<relevance>291121</relevance>
 <recid>content: title the religious teachers of greece author adam james</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_limit_limitmap_21.res b/test/test_limit_limitmap_21.res
index 8879b7f..0c2b760 100644
--- a/test/test_limit_limitmap_21.res
+++ b/test/test_limit_limitmap_21.res
@@ -17,7 +17,7 @@
 <md-author>Adam, James</md-author>
 <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>420000</relevance>
+<relevance>291121</relevance>
 <recid>content: title the religious teachers of greece author adam james</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_limit_limitmap_24.res b/test/test_limit_limitmap_24.res
index 12b9255..69e0dfa 100644
--- a/test/test_limit_limitmap_24.res
+++ b/test/test_limit_limitmap_24.res
@@ -19,7 +19,7 @@
 <md-author>Englund, Carl R</md-author>
 <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>85714</relevance>
+<relevance>59412</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_limit_limitmap_26.res b/test/test_limit_limitmap_26.res
index 4035d89..e69d6ea 100644
--- a/test/test_limit_limitmap_26.res
+++ b/test/test_limit_limitmap_26.res
@@ -15,7 +15,7 @@
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>57536</relevance>
+<relevance>102165</relevance>
 <recid>content: title computer science technology</recid>
 </hit>
 <hit>
@@ -29,7 +29,7 @@
 <md-description>Hebrew and Greek; introductions in English</md-description>
 <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>57536</relevance>
+<relevance>102165</relevance>
 <recid>content: title the computer bible</recid>
 </hit>
 <hit>
@@ -42,7 +42,7 @@
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>17260</relevance>
+<relevance>30649</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m</recid>
 </hit>
 <hit>
diff --git a/test/test_limit_limitmap_28.res b/test/test_limit_limitmap_28.res
index df0bf86..2d2dd41 100644
--- a/test/test_limit_limitmap_28.res
+++ b/test/test_limit_limitmap_28.res
@@ -20,7 +20,7 @@
 <md-author>Englund, Carl R</md-author>
 <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>85714</relevance>
+<relevance>59412</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_limit_limitmap_30.res b/test/test_limit_limitmap_30.res
index 8e739c7..fd0bdb2 100644
--- a/test/test_limit_limitmap_30.res
+++ b/test/test_limit_limitmap_30.res
@@ -16,7 +16,7 @@
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>57536</relevance>
+<relevance>102165</relevance>
 <recid>content: title computer science technology</recid>
 </hit>
 <hit>
@@ -30,7 +30,7 @@
 <md-description>Hebrew and Greek; introductions in English</md-description>
 <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>57536</relevance>
+<relevance>102165</relevance>
 <recid>content: title the computer bible</recid>
 </hit>
 <hit>
@@ -43,7 +43,7 @@
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>17260</relevance>
+<relevance>30649</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m</recid>
 </hit>
 <hit>
diff --git a/test/test_limit_limitmap_36.res b/test/test_limit_limitmap_36.res
index 8e739c7..fd0bdb2 100644
--- a/test/test_limit_limitmap_36.res
+++ b/test/test_limit_limitmap_36.res
@@ -16,7 +16,7 @@
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>57536</relevance>
+<relevance>102165</relevance>
 <recid>content: title computer science technology</recid>
 </hit>
 <hit>
@@ -30,7 +30,7 @@
 <md-description>Hebrew and Greek; introductions in English</md-description>
 <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>57536</relevance>
+<relevance>102165</relevance>
 <recid>content: title the computer bible</recid>
 </hit>
 <hit>
@@ -43,7 +43,7 @@
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>17260</relevance>
+<relevance>30649</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m</recid>
 </hit>
 <hit>
diff --git a/test/test_limit_limitmap_4.res b/test/test_limit_limitmap_4.res
index b50618a..3367e01 100644
--- a/test/test_limit_limitmap_4.res
+++ b/test/test_limit_limitmap_4.res
@@ -19,7 +19,7 @@
 <md-author>Jack Collins</md-author>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
 <count>2</count>
-<relevance>25286</relevance>
+<relevance>48160</relevance>
 <recid>content: title how to program a computer author jack collins</recid>
 </hit>
 <hit>
@@ -32,7 +32,7 @@
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>21072</relevance>
+<relevance>40134</relevance>
 <recid>content: title computer science technology</recid>
 </hit>
 <hit>
@@ -46,7 +46,7 @@
 <md-description>Hebrew and Greek; introductions in English</md-description>
 <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>21072</relevance>
+<relevance>40134</relevance>
 <recid>content: title the computer bible</recid>
 </hit>
 <hit>
@@ -59,7 +59,7 @@
 <md-date>1971</md-date>
 <md-description>Cover title</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title a plan for community college computer development</recid>
 </hit>
 <hit>
@@ -76,7 +76,7 @@
 <md-author>Englund, Carl R</md-author>
 <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r</recid>
 </hit>
 <hit>
@@ -93,7 +93,7 @@
 <md-author>Mairs, John W</md-author>
 <md-description>Scale of maps ca. 1:1,000,000</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>8780</relevance>
+<relevance>16722</relevance>
 <recid>content: title the puget sound region author mairs john w</recid>
 </hit>
 <hit>
@@ -106,7 +106,7 @@
 <md-title-remainder>the proceedings of a workshop</md-title-remainder>
 <md-date>1974</md-date>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera</recid>
 </hit>
 <hit>
@@ -119,7 +119,7 @@
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m</recid>
 </hit>
 <hit>
diff --git a/test/test_limit_limitmap_42.res b/test/test_limit_limitmap_42.res
index 8e739c7..fd0bdb2 100644
--- a/test/test_limit_limitmap_42.res
+++ b/test/test_limit_limitmap_42.res
@@ -16,7 +16,7 @@
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>57536</relevance>
+<relevance>102165</relevance>
 <recid>content: title computer science technology</recid>
 </hit>
 <hit>
@@ -30,7 +30,7 @@
 <md-description>Hebrew and Greek; introductions in English</md-description>
 <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>57536</relevance>
+<relevance>102165</relevance>
 <recid>content: title the computer bible</recid>
 </hit>
 <hit>
@@ -43,7 +43,7 @@
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author>
 <md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
-<relevance>17260</relevance>
+<relevance>30649</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m</recid>
 </hit>
 <hit>
diff --git a/test/test_limit_limitmap_9.res b/test/test_limit_limitmap_9.res
index 7eed3b1..05c0ac8 100644
--- a/test/test_limit_limitmap_9.res
+++ b/test/test_limit_limitmap_9.res
@@ -16,7 +16,7 @@
 <md-title-remainder>fast &amp; easy</md-title-remainder>
 <md-date>2001</md-date>
 <md-author>Woodward, C. Michael</md-author></location>
-<relevance>45304</relevance>
+<relevance>50734</relevance>
 <recid>content: title adobe illustrator for the mac author woodward c michael</recid>
 </hit>
 <hit>
@@ -26,7 +26,7 @@
  name="LOC-SOLR" checksum="3541567482">
 <md-title>Advanced computer performance modeling and simulation</md-title>
 <md-date>1998</md-date></location>
-<relevance>45304</relevance>
+<relevance>50734</relevance>
 <recid>content: title advanced computer performance modeling and simulation</recid>
 </hit>
 <hit>
@@ -42,7 +42,7 @@
 <md-date>2000</md-date>
 <md-author>Aldrich, Richard W</md-author>
 <md-description>&quot;April 2000.&quot;</md-description></location>
-<relevance>45304</relevance>
+<relevance>50734</relevance>
 <recid>content: title cyberterrorism and computer crimes author aldrich richard w</recid>
 </hit>
 <hit>
@@ -56,7 +56,7 @@
 <md-title-remainder>talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson &amp; Jed Harris, Terry Winograd, Stephanie Rosenbaum</md-title-remainder>
 <md-date>2000</md-date>
 <md-author>Kaasgaard, Klaus</md-author></location>
-<relevance>41529</relevance>
+<relevance>46506</relevance>
 <recid>content: title software design and usability author kaasgaard klaus</recid>
 </hit>
 <hit>
@@ -70,7 +70,7 @@
 <md-date>2000</md-date>
 <md-author>Knittel, John</md-author>
 <md-description>Explains what computer hacking is, who does it, and how dangerous it can be</md-description></location>
-<relevance>39715</relevance>
+<relevance>44474</relevance>
 <recid>content: title everything you need to know about the dangers of computer hacking author knittel john</recid>
 </hit>
 <hit>
@@ -82,7 +82,7 @@
 <md-title>Computer peripherals</md-title>
 <md-date>1995</md-date>
 <md-author>Cook, Barry M</md-author></location>
-<relevance>39641</relevance>
+<relevance>44392</relevance>
 <recid>content: title computer peripherals author cook barry m</recid>
 </hit>
 <hit>
@@ -95,7 +95,7 @@
 <md-date>1994</md-date>
 <md-description>&quot;For kids and their parents&quot;--Cover</md-description>
 <md-description>Discusses a variety of educational and game software for children  with suggestions for setting up a computer system. Includes a 3 1/2 in. disk with 6 shareware programs for children</md-description></location>
-<relevance>34817</relevance>
+<relevance>38990</relevance>
 <recid>content: title kids computer book</recid>
 </hit>
 <hit>
@@ -107,7 +107,7 @@
 <md-title>Computer friendly</md-title>
 <md-date>1999</md-date>
 <md-author>Steinbacher, Raymond</md-author></location>
-<relevance>33978</relevance>
+<relevance>38050</relevance>
 <recid>content: title computer friendly author steinbacher raymond</recid>
 </hit>
 <hit>
@@ -121,7 +121,7 @@
 <md-description>&quot;May 1999.&quot;</md-description>
 <md-description>&quot;NZLC R54&quot;--T.p. verso</md-description>
 <md-description>&quot;Also published as Parliamentary Paper E 31AO&quot;--T.p. verso</md-description></location>
-<relevance>33978</relevance>
+<relevance>38050</relevance>
 <recid>content: title computer misuse</recid>
 </hit>
 <hit>
@@ -135,7 +135,7 @@
 <md-title-remainder>a top-down approach featuring the Internet</md-title-remainder>
 <md-date>2001</md-date>
 <md-author>Ross, Keith W</md-author></location>
-<relevance>33978</relevance>
+<relevance>38050</relevance>
 <recid>content: title computer networking author ross keith w</recid>
 </hit>
 <hit>
@@ -149,7 +149,7 @@
 <md-date>1998</md-date>
 <md-author>Davis, Phyllis</md-author>
 <md-description>Includes index</md-description></location>
-<relevance>33978</relevance>
+<relevance>38050</relevance>
 <recid>content: title coreldraw for windows author davis phyllis</recid>
 </hit>
 <hit>
@@ -166,7 +166,7 @@
 <md-author>Langer, Maria</md-author>
 <md-description>Includes index</md-description>
 <md-description>&quot;Covers Quicken deluxe 2000 for the Mac&quot;--Cover</md-description></location>
-<relevance>33978</relevance>
+<relevance>38050</relevance>
 <recid>content: title quicken for the mac author langer maria</recid>
 </hit>
 <hit>
@@ -176,7 +176,7 @@
  name="LOC-SOLR" checksum="2604453496">
 <md-title>Sicherheit und Schutz im Netz</md-title>
 <md-date>1998</md-date></location>
-<relevance>33978</relevance>
+<relevance>38050</relevance>
 <recid>content: title sicherheit und schutz im netz</recid>
 </hit>
 <hit>
@@ -190,7 +190,7 @@
 <md-date>1999</md-date>
 <md-author>Carasik, Anne H</md-author>
 <md-description>Includes index</md-description></location>
-<relevance>33978</relevance>
+<relevance>38050</relevance>
 <recid>content: title unix secure shell author carasik anne h</recid>
 </hit>
 <hit>
@@ -204,7 +204,7 @@
 <md-title-remainder>proceedings, 11-13 October 1999, Boston, Massachusetts</md-title-remainder>
 <md-date>1999</md-date>
 <md-description>&quot;IEEE catalog number 99EX370&quot;--T.p. verso</md-description></location>
-<relevance>32090</relevance>
+<relevance>35936</relevance>
 <recid>content: title eight international conference on computer communications and networks</recid>
 </hit>
 <hit>
@@ -218,7 +218,7 @@
 <md-date>2000</md-date>
 <md-author>Farley, Marc</md-author>
 <md-description>Includes index</md-description></location>
-<relevance>30203</relevance>
+<relevance>33822</relevance>
 <recid>content: title building storage networks author farley marc</recid>
 </hit>
 <hit>
@@ -234,7 +234,7 @@
 <md-date>1999</md-date>
 <md-author>Malaga, Ernie</md-author>
 <md-description>Includes index</md-description></location>
-<relevance>30203</relevance>
+<relevance>33822</relevance>
 <recid>content: title complete cl author malaga ernie</recid>
 </hit>
 <hit>
@@ -248,7 +248,7 @@
 <md-title-remainder>real-time rendering and software technology</md-title-remainder>
 <md-date>2001</md-date>
 <md-author>Watt, Alan H</md-author></location>
-<relevance>30203</relevance>
+<relevance>33822</relevance>
 <recid>content: title d games author watt alan h</recid>
 </hit>
 <hit>
@@ -260,7 +260,7 @@
 <md-title>Java applications strategies for the AS/400</md-title>
 <md-date>1999</md-date>
 <md-author>Denoncourt, Don</md-author></location>
-<relevance>30203</relevance>
+<relevance>33822</relevance>
 <recid>content: title java applications strategies for the as author denoncourt don</recid>
 </hit>
 <hit>
@@ -275,7 +275,7 @@
 <md-author>Loudon, Kyle</md-author>
 <md-description>&quot;Useful techniques from sorting to encryption&quot;--Cover</md-description>
 <md-description>Includes index</md-description></location>
-<relevance>30203</relevance>
+<relevance>33822</relevance>
 <recid>content: title mastering algorithms with c author loudon kyle</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_post_10.res b/test/test_post_10.res
index a7d4186..1115b7d 100644
--- a/test/test_post_10.res
+++ b/test/test_post_10.res
@@ -17,7 +17,7 @@
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>25286</relevance>
+<relevance>48160</relevance>
 <recid>content: title how to program a computer author jack collins medium book</recid>
 </hit>
 <hit>
@@ -29,7 +29,7 @@
 <md-title>Computer science &amp; technology</md-title>
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date></location>
-<relevance>21072</relevance>
+<relevance>40134</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
@@ -39,7 +39,7 @@
  name="Index Data MARC test server" checksum="3136897450">
 <md-title>The Computer Bible</md-title>
 <md-date>1973-1980</md-date></location>
-<relevance>21072</relevance>
+<relevance>40134</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -49,7 +49,7 @@
  name="Index Data MARC test server" checksum="4182051184">
 <md-title>A plan for community college computer development</md-title>
 <md-date>1971</md-date></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
@@ -63,7 +63,7 @@
 <md-title-remainder>final report</md-title-remainder>
 <md-date>1971</md-date>
 <md-author>Englund, Carl R</md-author></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 <hit>
@@ -77,7 +77,7 @@
 <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
 <md-date>1974</md-date>
 <md-author>Mairs, John W</md-author></location>
-<relevance>8780</relevance>
+<relevance>16722</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -89,7 +89,7 @@
 <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
 <md-title-remainder>the proceedings of a workshop</md-title-remainder>
 <md-date>1974</md-date></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
@@ -101,7 +101,7 @@
 <md-title>The use of passwords for controlled access to computer resources</md-title>
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_post_8.res b/test/test_post_8.res
index a7d4186..1115b7d 100644
--- a/test/test_post_8.res
+++ b/test/test_post_8.res
@@ -17,7 +17,7 @@
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>25286</relevance>
+<relevance>48160</relevance>
 <recid>content: title how to program a computer author jack collins medium book</recid>
 </hit>
 <hit>
@@ -29,7 +29,7 @@
 <md-title>Computer science &amp; technology</md-title>
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date></location>
-<relevance>21072</relevance>
+<relevance>40134</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
@@ -39,7 +39,7 @@
  name="Index Data MARC test server" checksum="3136897450">
 <md-title>The Computer Bible</md-title>
 <md-date>1973-1980</md-date></location>
-<relevance>21072</relevance>
+<relevance>40134</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -49,7 +49,7 @@
  name="Index Data MARC test server" checksum="4182051184">
 <md-title>A plan for community college computer development</md-title>
 <md-date>1971</md-date></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
@@ -63,7 +63,7 @@
 <md-title-remainder>final report</md-title-remainder>
 <md-date>1971</md-date>
 <md-author>Englund, Carl R</md-author></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 <hit>
@@ -77,7 +77,7 @@
 <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
 <md-date>1974</md-date>
 <md-author>Mairs, John W</md-author></location>
-<relevance>8780</relevance>
+<relevance>16722</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -89,7 +89,7 @@
 <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
 <md-title-remainder>the proceedings of a workshop</md-title-remainder>
 <md-date>1974</md-date></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
@@ -101,7 +101,7 @@
 <md-title>The use of passwords for controlled access to computer resources</md-title>
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_solr_13.res b/test/test_solr_13.res
index 419fce4..c101e40 100644
--- a/test/test_solr_13.res
+++ b/test/test_solr_13.res
@@ -16,7 +16,7 @@
 <md-date>1999</md-date>
 <md-author>De Villiers, Marq</md-author>
 <md-medium>book</md-medium></location>
-<relevance>23233</relevance>
+<relevance>34675</relevance>
 <recid>content: title water author de villiers marq medium book</recid>
 </hit>
 <hit>
@@ -37,7 +37,7 @@
 <md-author>Baker, M. N</md-author>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>21645</relevance>
+<relevance>32306</relevance>
 <recid>content: title potable water and methods of detecting impurities author baker m n medium book</recid>
 </hit>
 <hit>
@@ -53,7 +53,7 @@
 <md-author>Majeed, Abdul</md-author>
 <md-description>&quot;Balochistan conservation strategy background paper&quot;--T.p</md-description>
 <md-medium>book</md-medium></location>
-<relevance>20202</relevance>
+<relevance>30153</relevance>
 <recid>content: title water author majeed abdul medium book</recid>
 </hit>
 <hit>
@@ -70,7 +70,7 @@
 <md-description>Includes index</md-description>
 <md-description>Examines major environmental issues surrounding water, giving examples of attempts to solve global problems and sources for more information</md-description>
 <md-medium>book</md-medium></location>
-<relevance>18501</relevance>
+<relevance>27613</relevance>
 <recid>content: title water author grant pamela medium book</recid>
 </hit>
 <hit>
@@ -86,7 +86,7 @@
 <md-author>Fisher, D. E</md-author>
 <md-description>Includes index</md-description>
 <md-medium>book</md-medium></location>
-<relevance>18182</relevance>
+<relevance>27137</relevance>
 <recid>content: title water law author fisher d e medium book</recid>
 </hit>
 <hit>
@@ -103,7 +103,7 @@
 <md-description>Issued also in French under title: Notions élémentaires sur l&apos;eau douce : questions et réponses</md-description>
 <md-description>Includes index</md-description>
 <md-medium>book</md-medium></location>
-<relevance>17576</relevance>
+<relevance>26233</relevance>
 <recid>content: title a primer on fresh water medium book</recid>
 </hit>
 <hit>
@@ -117,7 +117,7 @@
 <md-date>1901</md-date>
 <md-author>Thresh, John Clough</md-author>
 <md-medium>book</md-medium></location>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water and water supplies author thresh john clough medium book</recid>
 </hit>
 <hit>
@@ -140,7 +140,7 @@
 <md-description>&quot;September 1999.&quot;</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water quality assessment of the state water project medium book</recid>
 </hit>
 <hit>
@@ -156,7 +156,7 @@
 <md-date>1896</md-date>
 <md-author>Mason, William Pitt</md-author>
 <md-medium>book</md-medium></location>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water supply author mason william pitt medium book</recid>
 </hit>
 <hit>
@@ -172,7 +172,7 @@
 <md-date>1904</md-date>
 <md-author>Farnham, Henry P</md-author>
 <md-medium>book</md-medium></location>
-<relevance>14630</relevance>
+<relevance>21836</relevance>
 <recid>content: title the law of waters and water rights author farnham henry p medium book</recid>
 </hit>
 <hit>
@@ -197,7 +197,7 @@
 <md-description>With reference to India</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>13675</relevance>
+<relevance>20411</relevance>
 <recid>content: title water in press medium book</recid>
 </hit>
 <hit>
@@ -213,7 +213,7 @@
 <md-description>&quot;EPA/600/R-00/025.&quot;</md-description>
 <md-description>&quot;EPA Contract 68-C7-0011, work assignment 0-38.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13636</relevance>
+<relevance>20353</relevance>
 <recid>content: title regulations on the disposal of arsenic residuals from drinking water treatment plants medium book</recid>
 </hit>
 <hit>
@@ -229,7 +229,7 @@
 <md-author>Bryan, Michelle</md-author>
 <md-description>&quot;A joint publication of Legislative Environmental Policy Office, Environmental Quality Council [and] Montana University System, Water Center&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13199</relevance>
+<relevance>19700</relevance>
 <recid>content: title a guide to montana water quality regulation author bryan michelle medium book</recid>
 </hit>
 <hit>
@@ -243,7 +243,7 @@
 <md-date>2001</md-date>
 <md-description>Collection of articles with reference to India</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13131</relevance>
+<relevance>19599</relevance>
 <recid>content: title water technology management medium book</recid>
 </hit>
 <hit>
@@ -259,7 +259,7 @@
 <md-author>Bauer, Steve</md-author>
 <md-description>&quot;This document was developed for US Environmental Protection Agency, Region 10, Seattle Washington, with the Idaho Water Resources Institute, University of Idaho.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13016</relevance>
+<relevance>19427</relevance>
 <recid>content: title aquatic habitat indicators and their application to water quality objectives within the clean water act author bauer steve medium book</recid>
 </hit>
 <hit>
@@ -275,7 +275,7 @@
 <md-author>Saffran, Karen Anita</md-author>
 <md-description>&quot;March 1997.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>12929</relevance>
+<relevance>19297</relevance>
 <recid>content: title an empirical analysis of water temperature and dissolved oxygen conditions in the red deer river author saffran karen anita medium book</recid>
 </hit>
 <hit>
@@ -290,7 +290,7 @@
 <md-description>&quot;June 1999.&quot;</md-description>
 <md-description>&quot;GI-252&quot;--Cover</md-description>
 <md-medium>book</md-medium></location>
-<relevance>12626</relevance>
+<relevance>18845</relevance>
 <recid>content: title surface water quality monitoring procedures manual medium book</recid>
 </hit>
 <hit>
@@ -304,7 +304,7 @@
 <md-title-remainder>proceedings</md-title-remainder>
 <md-date>1997</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12323</relevance>
+<relevance>18393</relevance>
 <recid>content: title international conference on management of drinking water resources chennai december medium book</recid>
 </hit>
 <hit>
@@ -316,7 +316,7 @@
 <md-title>Mercados e instituciones de aguas en Bolivia</md-title>
 <md-date>1998</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12121</relevance>
+<relevance>18091</relevance>
 <recid>content: title mercados e instituciones de aguas en bolivia medium book</recid>
 </hit>
 <hit>
@@ -328,7 +328,7 @@
 <md-title>Water law</md-title>
 <md-date>2000</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12121</relevance>
+<relevance>18091</relevance>
 <recid>content: title water law medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_solr_18.res b/test/test_solr_18.res
index 7964d8b..c8675c8 100644
--- a/test/test_solr_18.res
+++ b/test/test_solr_18.res
@@ -16,7 +16,7 @@
 <md-date>1999</md-date>
 <md-author>De Villiers, Marq</md-author>
 <md-medium>book</md-medium></location>
-<relevance>29115</relevance>
+<relevance>34851</relevance>
 <recid>content: title water author de villiers marq medium book</recid>
 </hit>
 <hit>
@@ -37,7 +37,7 @@
 <md-author>Baker, M. N</md-author>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>27126</relevance>
+<relevance>32470</relevance>
 <recid>content: title potable water and methods of detecting impurities author baker m n medium book</recid>
 </hit>
 <hit>
@@ -53,7 +53,7 @@
 <md-author>Majeed, Abdul</md-author>
 <md-description>&quot;Balochistan conservation strategy background paper&quot;--T.p</md-description>
 <md-medium>book</md-medium></location>
-<relevance>25317</relevance>
+<relevance>30305</relevance>
 <recid>content: title water author majeed abdul medium book</recid>
 </hit>
 <hit>
@@ -70,7 +70,7 @@
 <md-description>Includes index</md-description>
 <md-description>Examines major environmental issues surrounding water, giving examples of attempts to solve global problems and sources for more information</md-description>
 <md-medium>book</md-medium></location>
-<relevance>23185</relevance>
+<relevance>27753</relevance>
 <recid>content: title water author grant pamela medium book</recid>
 </hit>
 <hit>
@@ -86,7 +86,7 @@
 <md-author>Fisher, D. E</md-author>
 <md-description>Includes index</md-description>
 <md-medium>book</md-medium></location>
-<relevance>22786</relevance>
+<relevance>27274</relevance>
 <recid>content: title water law author fisher d e medium book</recid>
 </hit>
 <hit>
@@ -103,7 +103,7 @@
 <md-description>Issued also in French under title: Notions élémentaires sur l&apos;eau douce : questions et réponses</md-description>
 <md-description>Includes index</md-description>
 <md-medium>book</md-medium></location>
-<relevance>22026</relevance>
+<relevance>26365</relevance>
 <recid>content: title a primer on fresh water medium book</recid>
 </hit>
 <hit>
@@ -117,7 +117,7 @@
 <md-date>1901</md-date>
 <md-author>Thresh, John Clough</md-author>
 <md-medium>book</md-medium></location>
-<relevance>18988</relevance>
+<relevance>22729</relevance>
 <recid>content: title water and water supplies author thresh john clough medium book</recid>
 </hit>
 <hit>
@@ -140,7 +140,7 @@
 <md-description>&quot;September 1999.&quot;</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>18988</relevance>
+<relevance>22729</relevance>
 <recid>content: title water quality assessment of the state water project medium book</recid>
 </hit>
 <hit>
@@ -156,7 +156,7 @@
 <md-date>1896</md-date>
 <md-author>Mason, William Pitt</md-author>
 <md-medium>book</md-medium></location>
-<relevance>18988</relevance>
+<relevance>22729</relevance>
 <recid>content: title water supply author mason william pitt medium book</recid>
 </hit>
 <hit>
@@ -172,7 +172,7 @@
 <md-date>1904</md-date>
 <md-author>Farnham, Henry P</md-author>
 <md-medium>book</md-medium></location>
-<relevance>18334</relevance>
+<relevance>21946</relevance>
 <recid>content: title the law of waters and water rights author farnham henry p medium book</recid>
 </hit>
 <hit>
@@ -197,7 +197,7 @@
 <md-description>With reference to India</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>17138</relevance>
+<relevance>20514</relevance>
 <recid>content: title water in press medium book</recid>
 </hit>
 <hit>
@@ -223,7 +223,7 @@
 <md-description>Original imprint 1901, corrected to 1900</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>17138</relevance>
+<relevance>20514</relevance>
 <recid>content: title water power author frizell joseph p medium book</recid>
 </hit>
 <hit>
@@ -247,7 +247,7 @@
 <md-author>Folwell, Amory Prescott</md-author>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>17138</relevance>
+<relevance>20514</relevance>
 <recid>content: title water supply engineering author folwell amory prescott medium book</recid>
 </hit>
 <hit>
@@ -263,7 +263,7 @@
 <md-description>&quot;EPA/600/R-00/025.&quot;</md-description>
 <md-description>&quot;EPA Contract 68-C7-0011, work assignment 0-38.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>17089</relevance>
+<relevance>20456</relevance>
 <recid>content: title regulations on the disposal of arsenic residuals from drinking water treatment plants medium book</recid>
 </hit>
 <hit>
@@ -279,7 +279,7 @@
 <md-author>Bryan, Michelle</md-author>
 <md-description>&quot;A joint publication of Legislative Environmental Policy Office, Environmental Quality Council [and] Montana University System, Water Center&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>16541</relevance>
+<relevance>19800</relevance>
 <recid>content: title a guide to montana water quality regulation author bryan michelle medium book</recid>
 </hit>
 <hit>
@@ -293,7 +293,7 @@
 <md-date>2001</md-date>
 <md-description>Collection of articles with reference to India</md-description>
 <md-medium>book</md-medium></location>
-<relevance>16456</relevance>
+<relevance>19698</relevance>
 <recid>content: title water technology management medium book</recid>
 </hit>
 <hit>
@@ -309,7 +309,7 @@
 <md-author>Bauer, Steve</md-author>
 <md-description>&quot;This document was developed for US Environmental Protection Agency, Region 10, Seattle Washington, with the Idaho Water Resources Institute, University of Idaho.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>16311</relevance>
+<relevance>19525</relevance>
 <recid>content: title aquatic habitat indicators and their application to water quality objectives within the clean water act author bauer steve medium book</recid>
 </hit>
 <hit>
@@ -325,7 +325,7 @@
 <md-author>Saffran, Karen Anita</md-author>
 <md-description>&quot;March 1997.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>16203</relevance>
+<relevance>19395</relevance>
 <recid>content: title an empirical analysis of water temperature and dissolved oxygen conditions in the red deer river author saffran karen anita medium book</recid>
 </hit>
 <hit>
@@ -340,7 +340,7 @@
 <md-description>&quot;June 1999.&quot;</md-description>
 <md-description>&quot;GI-252&quot;--Cover</md-description>
 <md-medium>book</md-medium></location>
-<relevance>15823</relevance>
+<relevance>18940</relevance>
 <recid>content: title surface water quality monitoring procedures manual medium book</recid>
 </hit>
 <hit>
@@ -354,7 +354,7 @@
 <md-title-remainder>proceedings</md-title-remainder>
 <md-date>1997</md-date>
 <md-medium>book</md-medium></location>
-<relevance>15443</relevance>
+<relevance>18486</relevance>
 <recid>content: title international conference on management of drinking water resources chennai december medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_solr_22.res b/test/test_solr_22.res
index 1d39bd2..8f79d6f 100644
--- a/test/test_solr_22.res
+++ b/test/test_solr_22.res
@@ -18,7 +18,7 @@
 <md-description>&quot;January 2000.&quot;</md-description>
 <md-description>&quot;In response to Special Act No. 99-6.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>300000</relevance>
+<relevance>121639</relevance>
 <recid>content: title the nitrogen permitting and trading plan for long island sound medium book</recid>
 </hit>
 <hit>
@@ -30,7 +30,7 @@
 <md-title>Report of the Water commissioners to the Common council of the city of Albany;</md-title>
 <md-date>1872</md-date>
 <md-medium>book</md-medium></location>
-<relevance>192857</relevance>
+<relevance>78196</relevance>
 <recid>content: title report of the water commissioners to the common council of the city of albany medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_solr_25.res b/test/test_solr_25.res
index 419fce4..c101e40 100644
--- a/test/test_solr_25.res
+++ b/test/test_solr_25.res
@@ -16,7 +16,7 @@
 <md-date>1999</md-date>
 <md-author>De Villiers, Marq</md-author>
 <md-medium>book</md-medium></location>
-<relevance>23233</relevance>
+<relevance>34675</relevance>
 <recid>content: title water author de villiers marq medium book</recid>
 </hit>
 <hit>
@@ -37,7 +37,7 @@
 <md-author>Baker, M. N</md-author>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>21645</relevance>
+<relevance>32306</relevance>
 <recid>content: title potable water and methods of detecting impurities author baker m n medium book</recid>
 </hit>
 <hit>
@@ -53,7 +53,7 @@
 <md-author>Majeed, Abdul</md-author>
 <md-description>&quot;Balochistan conservation strategy background paper&quot;--T.p</md-description>
 <md-medium>book</md-medium></location>
-<relevance>20202</relevance>
+<relevance>30153</relevance>
 <recid>content: title water author majeed abdul medium book</recid>
 </hit>
 <hit>
@@ -70,7 +70,7 @@
 <md-description>Includes index</md-description>
 <md-description>Examines major environmental issues surrounding water, giving examples of attempts to solve global problems and sources for more information</md-description>
 <md-medium>book</md-medium></location>
-<relevance>18501</relevance>
+<relevance>27613</relevance>
 <recid>content: title water author grant pamela medium book</recid>
 </hit>
 <hit>
@@ -86,7 +86,7 @@
 <md-author>Fisher, D. E</md-author>
 <md-description>Includes index</md-description>
 <md-medium>book</md-medium></location>
-<relevance>18182</relevance>
+<relevance>27137</relevance>
 <recid>content: title water law author fisher d e medium book</recid>
 </hit>
 <hit>
@@ -103,7 +103,7 @@
 <md-description>Issued also in French under title: Notions élémentaires sur l&apos;eau douce : questions et réponses</md-description>
 <md-description>Includes index</md-description>
 <md-medium>book</md-medium></location>
-<relevance>17576</relevance>
+<relevance>26233</relevance>
 <recid>content: title a primer on fresh water medium book</recid>
 </hit>
 <hit>
@@ -117,7 +117,7 @@
 <md-date>1901</md-date>
 <md-author>Thresh, John Clough</md-author>
 <md-medium>book</md-medium></location>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water and water supplies author thresh john clough medium book</recid>
 </hit>
 <hit>
@@ -140,7 +140,7 @@
 <md-description>&quot;September 1999.&quot;</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water quality assessment of the state water project medium book</recid>
 </hit>
 <hit>
@@ -156,7 +156,7 @@
 <md-date>1896</md-date>
 <md-author>Mason, William Pitt</md-author>
 <md-medium>book</md-medium></location>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water supply author mason william pitt medium book</recid>
 </hit>
 <hit>
@@ -172,7 +172,7 @@
 <md-date>1904</md-date>
 <md-author>Farnham, Henry P</md-author>
 <md-medium>book</md-medium></location>
-<relevance>14630</relevance>
+<relevance>21836</relevance>
 <recid>content: title the law of waters and water rights author farnham henry p medium book</recid>
 </hit>
 <hit>
@@ -197,7 +197,7 @@
 <md-description>With reference to India</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>13675</relevance>
+<relevance>20411</relevance>
 <recid>content: title water in press medium book</recid>
 </hit>
 <hit>
@@ -213,7 +213,7 @@
 <md-description>&quot;EPA/600/R-00/025.&quot;</md-description>
 <md-description>&quot;EPA Contract 68-C7-0011, work assignment 0-38.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13636</relevance>
+<relevance>20353</relevance>
 <recid>content: title regulations on the disposal of arsenic residuals from drinking water treatment plants medium book</recid>
 </hit>
 <hit>
@@ -229,7 +229,7 @@
 <md-author>Bryan, Michelle</md-author>
 <md-description>&quot;A joint publication of Legislative Environmental Policy Office, Environmental Quality Council [and] Montana University System, Water Center&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13199</relevance>
+<relevance>19700</relevance>
 <recid>content: title a guide to montana water quality regulation author bryan michelle medium book</recid>
 </hit>
 <hit>
@@ -243,7 +243,7 @@
 <md-date>2001</md-date>
 <md-description>Collection of articles with reference to India</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13131</relevance>
+<relevance>19599</relevance>
 <recid>content: title water technology management medium book</recid>
 </hit>
 <hit>
@@ -259,7 +259,7 @@
 <md-author>Bauer, Steve</md-author>
 <md-description>&quot;This document was developed for US Environmental Protection Agency, Region 10, Seattle Washington, with the Idaho Water Resources Institute, University of Idaho.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13016</relevance>
+<relevance>19427</relevance>
 <recid>content: title aquatic habitat indicators and their application to water quality objectives within the clean water act author bauer steve medium book</recid>
 </hit>
 <hit>
@@ -275,7 +275,7 @@
 <md-author>Saffran, Karen Anita</md-author>
 <md-description>&quot;March 1997.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>12929</relevance>
+<relevance>19297</relevance>
 <recid>content: title an empirical analysis of water temperature and dissolved oxygen conditions in the red deer river author saffran karen anita medium book</recid>
 </hit>
 <hit>
@@ -290,7 +290,7 @@
 <md-description>&quot;June 1999.&quot;</md-description>
 <md-description>&quot;GI-252&quot;--Cover</md-description>
 <md-medium>book</md-medium></location>
-<relevance>12626</relevance>
+<relevance>18845</relevance>
 <recid>content: title surface water quality monitoring procedures manual medium book</recid>
 </hit>
 <hit>
@@ -304,7 +304,7 @@
 <md-title-remainder>proceedings</md-title-remainder>
 <md-date>1997</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12323</relevance>
+<relevance>18393</relevance>
 <recid>content: title international conference on management of drinking water resources chennai december medium book</recid>
 </hit>
 <hit>
@@ -316,7 +316,7 @@
 <md-title>Mercados e instituciones de aguas en Bolivia</md-title>
 <md-date>1998</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12121</relevance>
+<relevance>18091</relevance>
 <recid>content: title mercados e instituciones de aguas en bolivia medium book</recid>
 </hit>
 <hit>
@@ -328,7 +328,7 @@
 <md-title>Water law</md-title>
 <md-date>2000</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12121</relevance>
+<relevance>18091</relevance>
 <recid>content: title water law medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_solr_29.res b/test/test_solr_29.res
index 1d39bd2..8f79d6f 100644
--- a/test/test_solr_29.res
+++ b/test/test_solr_29.res
@@ -18,7 +18,7 @@
 <md-description>&quot;January 2000.&quot;</md-description>
 <md-description>&quot;In response to Special Act No. 99-6.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>300000</relevance>
+<relevance>121639</relevance>
 <recid>content: title the nitrogen permitting and trading plan for long island sound medium book</recid>
 </hit>
 <hit>
@@ -30,7 +30,7 @@
 <md-title>Report of the Water commissioners to the Common council of the city of Albany;</md-title>
 <md-date>1872</md-date>
 <md-medium>book</md-medium></location>
-<relevance>192857</relevance>
+<relevance>78196</relevance>
 <recid>content: title report of the water commissioners to the common council of the city of albany medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_solr_4.res b/test/test_solr_4.res
index 419fce4..c101e40 100644
--- a/test/test_solr_4.res
+++ b/test/test_solr_4.res
@@ -16,7 +16,7 @@
 <md-date>1999</md-date>
 <md-author>De Villiers, Marq</md-author>
 <md-medium>book</md-medium></location>
-<relevance>23233</relevance>
+<relevance>34675</relevance>
 <recid>content: title water author de villiers marq medium book</recid>
 </hit>
 <hit>
@@ -37,7 +37,7 @@
 <md-author>Baker, M. N</md-author>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>21645</relevance>
+<relevance>32306</relevance>
 <recid>content: title potable water and methods of detecting impurities author baker m n medium book</recid>
 </hit>
 <hit>
@@ -53,7 +53,7 @@
 <md-author>Majeed, Abdul</md-author>
 <md-description>&quot;Balochistan conservation strategy background paper&quot;--T.p</md-description>
 <md-medium>book</md-medium></location>
-<relevance>20202</relevance>
+<relevance>30153</relevance>
 <recid>content: title water author majeed abdul medium book</recid>
 </hit>
 <hit>
@@ -70,7 +70,7 @@
 <md-description>Includes index</md-description>
 <md-description>Examines major environmental issues surrounding water, giving examples of attempts to solve global problems and sources for more information</md-description>
 <md-medium>book</md-medium></location>
-<relevance>18501</relevance>
+<relevance>27613</relevance>
 <recid>content: title water author grant pamela medium book</recid>
 </hit>
 <hit>
@@ -86,7 +86,7 @@
 <md-author>Fisher, D. E</md-author>
 <md-description>Includes index</md-description>
 <md-medium>book</md-medium></location>
-<relevance>18182</relevance>
+<relevance>27137</relevance>
 <recid>content: title water law author fisher d e medium book</recid>
 </hit>
 <hit>
@@ -103,7 +103,7 @@
 <md-description>Issued also in French under title: Notions élémentaires sur l&apos;eau douce : questions et réponses</md-description>
 <md-description>Includes index</md-description>
 <md-medium>book</md-medium></location>
-<relevance>17576</relevance>
+<relevance>26233</relevance>
 <recid>content: title a primer on fresh water medium book</recid>
 </hit>
 <hit>
@@ -117,7 +117,7 @@
 <md-date>1901</md-date>
 <md-author>Thresh, John Clough</md-author>
 <md-medium>book</md-medium></location>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water and water supplies author thresh john clough medium book</recid>
 </hit>
 <hit>
@@ -140,7 +140,7 @@
 <md-description>&quot;September 1999.&quot;</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water quality assessment of the state water project medium book</recid>
 </hit>
 <hit>
@@ -156,7 +156,7 @@
 <md-date>1896</md-date>
 <md-author>Mason, William Pitt</md-author>
 <md-medium>book</md-medium></location>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water supply author mason william pitt medium book</recid>
 </hit>
 <hit>
@@ -172,7 +172,7 @@
 <md-date>1904</md-date>
 <md-author>Farnham, Henry P</md-author>
 <md-medium>book</md-medium></location>
-<relevance>14630</relevance>
+<relevance>21836</relevance>
 <recid>content: title the law of waters and water rights author farnham henry p medium book</recid>
 </hit>
 <hit>
@@ -197,7 +197,7 @@
 <md-description>With reference to India</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>13675</relevance>
+<relevance>20411</relevance>
 <recid>content: title water in press medium book</recid>
 </hit>
 <hit>
@@ -213,7 +213,7 @@
 <md-description>&quot;EPA/600/R-00/025.&quot;</md-description>
 <md-description>&quot;EPA Contract 68-C7-0011, work assignment 0-38.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13636</relevance>
+<relevance>20353</relevance>
 <recid>content: title regulations on the disposal of arsenic residuals from drinking water treatment plants medium book</recid>
 </hit>
 <hit>
@@ -229,7 +229,7 @@
 <md-author>Bryan, Michelle</md-author>
 <md-description>&quot;A joint publication of Legislative Environmental Policy Office, Environmental Quality Council [and] Montana University System, Water Center&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13199</relevance>
+<relevance>19700</relevance>
 <recid>content: title a guide to montana water quality regulation author bryan michelle medium book</recid>
 </hit>
 <hit>
@@ -243,7 +243,7 @@
 <md-date>2001</md-date>
 <md-description>Collection of articles with reference to India</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13131</relevance>
+<relevance>19599</relevance>
 <recid>content: title water technology management medium book</recid>
 </hit>
 <hit>
@@ -259,7 +259,7 @@
 <md-author>Bauer, Steve</md-author>
 <md-description>&quot;This document was developed for US Environmental Protection Agency, Region 10, Seattle Washington, with the Idaho Water Resources Institute, University of Idaho.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13016</relevance>
+<relevance>19427</relevance>
 <recid>content: title aquatic habitat indicators and their application to water quality objectives within the clean water act author bauer steve medium book</recid>
 </hit>
 <hit>
@@ -275,7 +275,7 @@
 <md-author>Saffran, Karen Anita</md-author>
 <md-description>&quot;March 1997.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>12929</relevance>
+<relevance>19297</relevance>
 <recid>content: title an empirical analysis of water temperature and dissolved oxygen conditions in the red deer river author saffran karen anita medium book</recid>
 </hit>
 <hit>
@@ -290,7 +290,7 @@
 <md-description>&quot;June 1999.&quot;</md-description>
 <md-description>&quot;GI-252&quot;--Cover</md-description>
 <md-medium>book</md-medium></location>
-<relevance>12626</relevance>
+<relevance>18845</relevance>
 <recid>content: title surface water quality monitoring procedures manual medium book</recid>
 </hit>
 <hit>
@@ -304,7 +304,7 @@
 <md-title-remainder>proceedings</md-title-remainder>
 <md-date>1997</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12323</relevance>
+<relevance>18393</relevance>
 <recid>content: title international conference on management of drinking water resources chennai december medium book</recid>
 </hit>
 <hit>
@@ -316,7 +316,7 @@
 <md-title>Mercados e instituciones de aguas en Bolivia</md-title>
 <md-date>1998</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12121</relevance>
+<relevance>18091</relevance>
 <recid>content: title mercados e instituciones de aguas en bolivia medium book</recid>
 </hit>
 <hit>
@@ -328,7 +328,7 @@
 <md-title>Water law</md-title>
 <md-date>2000</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12121</relevance>
+<relevance>18091</relevance>
 <recid>content: title water law medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_solr_9.res b/test/test_solr_9.res
index 419fce4..c101e40 100644
--- a/test/test_solr_9.res
+++ b/test/test_solr_9.res
@@ -16,7 +16,7 @@
 <md-date>1999</md-date>
 <md-author>De Villiers, Marq</md-author>
 <md-medium>book</md-medium></location>
-<relevance>23233</relevance>
+<relevance>34675</relevance>
 <recid>content: title water author de villiers marq medium book</recid>
 </hit>
 <hit>
@@ -37,7 +37,7 @@
 <md-author>Baker, M. N</md-author>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>21645</relevance>
+<relevance>32306</relevance>
 <recid>content: title potable water and methods of detecting impurities author baker m n medium book</recid>
 </hit>
 <hit>
@@ -53,7 +53,7 @@
 <md-author>Majeed, Abdul</md-author>
 <md-description>&quot;Balochistan conservation strategy background paper&quot;--T.p</md-description>
 <md-medium>book</md-medium></location>
-<relevance>20202</relevance>
+<relevance>30153</relevance>
 <recid>content: title water author majeed abdul medium book</recid>
 </hit>
 <hit>
@@ -70,7 +70,7 @@
 <md-description>Includes index</md-description>
 <md-description>Examines major environmental issues surrounding water, giving examples of attempts to solve global problems and sources for more information</md-description>
 <md-medium>book</md-medium></location>
-<relevance>18501</relevance>
+<relevance>27613</relevance>
 <recid>content: title water author grant pamela medium book</recid>
 </hit>
 <hit>
@@ -86,7 +86,7 @@
 <md-author>Fisher, D. E</md-author>
 <md-description>Includes index</md-description>
 <md-medium>book</md-medium></location>
-<relevance>18182</relevance>
+<relevance>27137</relevance>
 <recid>content: title water law author fisher d e medium book</recid>
 </hit>
 <hit>
@@ -103,7 +103,7 @@
 <md-description>Issued also in French under title: Notions élémentaires sur l&apos;eau douce : questions et réponses</md-description>
 <md-description>Includes index</md-description>
 <md-medium>book</md-medium></location>
-<relevance>17576</relevance>
+<relevance>26233</relevance>
 <recid>content: title a primer on fresh water medium book</recid>
 </hit>
 <hit>
@@ -117,7 +117,7 @@
 <md-date>1901</md-date>
 <md-author>Thresh, John Clough</md-author>
 <md-medium>book</md-medium></location>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water and water supplies author thresh john clough medium book</recid>
 </hit>
 <hit>
@@ -140,7 +140,7 @@
 <md-description>&quot;September 1999.&quot;</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water quality assessment of the state water project medium book</recid>
 </hit>
 <hit>
@@ -156,7 +156,7 @@
 <md-date>1896</md-date>
 <md-author>Mason, William Pitt</md-author>
 <md-medium>book</md-medium></location>
-<relevance>15152</relevance>
+<relevance>22614</relevance>
 <recid>content: title water supply author mason william pitt medium book</recid>
 </hit>
 <hit>
@@ -172,7 +172,7 @@
 <md-date>1904</md-date>
 <md-author>Farnham, Henry P</md-author>
 <md-medium>book</md-medium></location>
-<relevance>14630</relevance>
+<relevance>21836</relevance>
 <recid>content: title the law of waters and water rights author farnham henry p medium book</recid>
 </hit>
 <hit>
@@ -197,7 +197,7 @@
 <md-description>With reference to India</md-description>
 <md-medium>book</md-medium></location>
 <count>2</count>
-<relevance>13675</relevance>
+<relevance>20411</relevance>
 <recid>content: title water in press medium book</recid>
 </hit>
 <hit>
@@ -213,7 +213,7 @@
 <md-description>&quot;EPA/600/R-00/025.&quot;</md-description>
 <md-description>&quot;EPA Contract 68-C7-0011, work assignment 0-38.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13636</relevance>
+<relevance>20353</relevance>
 <recid>content: title regulations on the disposal of arsenic residuals from drinking water treatment plants medium book</recid>
 </hit>
 <hit>
@@ -229,7 +229,7 @@
 <md-author>Bryan, Michelle</md-author>
 <md-description>&quot;A joint publication of Legislative Environmental Policy Office, Environmental Quality Council [and] Montana University System, Water Center&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13199</relevance>
+<relevance>19700</relevance>
 <recid>content: title a guide to montana water quality regulation author bryan michelle medium book</recid>
 </hit>
 <hit>
@@ -243,7 +243,7 @@
 <md-date>2001</md-date>
 <md-description>Collection of articles with reference to India</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13131</relevance>
+<relevance>19599</relevance>
 <recid>content: title water technology management medium book</recid>
 </hit>
 <hit>
@@ -259,7 +259,7 @@
 <md-author>Bauer, Steve</md-author>
 <md-description>&quot;This document was developed for US Environmental Protection Agency, Region 10, Seattle Washington, with the Idaho Water Resources Institute, University of Idaho.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>13016</relevance>
+<relevance>19427</relevance>
 <recid>content: title aquatic habitat indicators and their application to water quality objectives within the clean water act author bauer steve medium book</recid>
 </hit>
 <hit>
@@ -275,7 +275,7 @@
 <md-author>Saffran, Karen Anita</md-author>
 <md-description>&quot;March 1997.&quot;</md-description>
 <md-medium>book</md-medium></location>
-<relevance>12929</relevance>
+<relevance>19297</relevance>
 <recid>content: title an empirical analysis of water temperature and dissolved oxygen conditions in the red deer river author saffran karen anita medium book</recid>
 </hit>
 <hit>
@@ -290,7 +290,7 @@
 <md-description>&quot;June 1999.&quot;</md-description>
 <md-description>&quot;GI-252&quot;--Cover</md-description>
 <md-medium>book</md-medium></location>
-<relevance>12626</relevance>
+<relevance>18845</relevance>
 <recid>content: title surface water quality monitoring procedures manual medium book</recid>
 </hit>
 <hit>
@@ -304,7 +304,7 @@
 <md-title-remainder>proceedings</md-title-remainder>
 <md-date>1997</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12323</relevance>
+<relevance>18393</relevance>
 <recid>content: title international conference on management of drinking water resources chennai december medium book</recid>
 </hit>
 <hit>
@@ -316,7 +316,7 @@
 <md-title>Mercados e instituciones de aguas en Bolivia</md-title>
 <md-date>1998</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12121</relevance>
+<relevance>18091</relevance>
 <recid>content: title mercados e instituciones de aguas en bolivia medium book</recid>
 </hit>
 <hit>
@@ -328,7 +328,7 @@
 <md-title>Water law</md-title>
 <md-date>2000</md-date>
 <md-medium>book</md-medium></location>
-<relevance>12121</relevance>
+<relevance>18091</relevance>
 <recid>content: title water law medium book</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_termlist_block_9.res b/test/test_termlist_block_9.res
index 5da3757..e2a4318 100644
--- a/test/test_termlist_block_9.res
+++ b/test/test_termlist_block_9.res
@@ -16,7 +16,7 @@
 <md-title-remainder>fast &amp; easy</md-title-remainder>
 <md-date>2001</md-date>
 <md-author>Woodward, C. Michael</md-author></location>
-<relevance>43542</relevance>
+<relevance>49512</relevance>
 <recid>content: title adobe illustrator for the mac author woodward c michael</recid>
 </hit>
 <hit>
@@ -26,7 +26,7 @@
  name="LOC (SOLR)" checksum="3924860916">
 <md-title>Advanced computer performance modeling and simulation</md-title>
 <md-date>1998</md-date></location>
-<relevance>43542</relevance>
+<relevance>49512</relevance>
 <recid>content: title advanced computer performance modeling and simulation</recid>
 </hit>
 <hit>
@@ -42,7 +42,7 @@
 <md-date>2000</md-date>
 <md-author>Aldrich, Richard W</md-author>
 <md-description>&quot;April 2000.&quot;</md-description></location>
-<relevance>43542</relevance>
+<relevance>49512</relevance>
 <recid>content: title cyberterrorism and computer crimes author aldrich richard w</recid>
 </hit>
 <hit>
@@ -56,7 +56,7 @@
 <md-title-remainder>talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson &amp; Jed Harris, Terry Winograd, Stephanie Rosenbaum</md-title-remainder>
 <md-date>2000</md-date>
 <md-author>Kaasgaard, Klaus</md-author></location>
-<relevance>39913</relevance>
+<relevance>45386</relevance>
 <recid>content: title software design and usability author kaasgaard klaus</recid>
 </hit>
 <hit>
@@ -70,7 +70,7 @@
 <md-date>2000</md-date>
 <md-author>Knittel, John</md-author>
 <md-description>Explains what computer hacking is, who does it, and how dangerous it can be</md-description></location>
-<relevance>38170</relevance>
+<relevance>43403</relevance>
 <recid>content: title everything you need to know about the dangers of computer hacking author knittel john</recid>
 </hit>
 <hit>
@@ -82,7 +82,7 @@
 <md-title>Computer peripherals</md-title>
 <md-date>1995</md-date>
 <md-author>Cook, Barry M</md-author></location>
-<relevance>38099</relevance>
+<relevance>43323</relevance>
 <recid>content: title computer peripherals author cook barry m</recid>
 </hit>
 <hit>
@@ -95,7 +95,7 @@
 <md-date>1994</md-date>
 <md-description>&quot;For kids and their parents&quot;--Cover</md-description>
 <md-description>Discusses a variety of educational and game software for children  with suggestions for setting up a computer system. Includes a 3 1/2 in. disk with 6 shareware programs for children</md-description></location>
-<relevance>33463</relevance>
+<relevance>38051</relevance>
 <recid>content: title kids computer book</recid>
 </hit>
 <hit>
@@ -107,7 +107,7 @@
 <md-title>Computer friendly</md-title>
 <md-date>1999</md-date>
 <md-author>Steinbacher, Raymond</md-author></location>
-<relevance>32656</relevance>
+<relevance>37134</relevance>
 <recid>content: title computer friendly author steinbacher raymond</recid>
 </hit>
 <hit>
@@ -121,7 +121,7 @@
 <md-description>&quot;May 1999.&quot;</md-description>
 <md-description>&quot;NZLC R54&quot;--T.p. verso</md-description>
 <md-description>&quot;Also published as Parliamentary Paper E 31AO&quot;--T.p. verso</md-description></location>
-<relevance>32656</relevance>
+<relevance>37134</relevance>
 <recid>content: title computer misuse</recid>
 </hit>
 <hit>
@@ -135,7 +135,7 @@
 <md-title-remainder>a top-down approach featuring the Internet</md-title-remainder>
 <md-date>2001</md-date>
 <md-author>Ross, Keith W</md-author></location>
-<relevance>32656</relevance>
+<relevance>37134</relevance>
 <recid>content: title computer networking author ross keith w</recid>
 </hit>
 <hit>
@@ -149,7 +149,7 @@
 <md-date>1998</md-date>
 <md-author>Davis, Phyllis</md-author>
 <md-description>Includes index</md-description></location>
-<relevance>32656</relevance>
+<relevance>37134</relevance>
 <recid>content: title coreldraw for windows author davis phyllis</recid>
 </hit>
 <hit>
@@ -166,7 +166,7 @@
 <md-author>Langer, Maria</md-author>
 <md-description>Includes index</md-description>
 <md-description>&quot;Covers Quicken deluxe 2000 for the Mac&quot;--Cover</md-description></location>
-<relevance>32656</relevance>
+<relevance>37134</relevance>
 <recid>content: title quicken for the mac author langer maria</recid>
 </hit>
 <hit>
@@ -176,7 +176,7 @@
  name="LOC (SOLR)" checksum="932616346">
 <md-title>Sicherheit und Schutz im Netz</md-title>
 <md-date>1998</md-date></location>
-<relevance>32656</relevance>
+<relevance>37134</relevance>
 <recid>content: title sicherheit und schutz im netz</recid>
 </hit>
 <hit>
@@ -190,7 +190,7 @@
 <md-date>1999</md-date>
 <md-author>Carasik, Anne H</md-author>
 <md-description>Includes index</md-description></location>
-<relevance>32656</relevance>
+<relevance>37134</relevance>
 <recid>content: title unix secure shell author carasik anne h</recid>
 </hit>
 <hit>
@@ -204,7 +204,7 @@
 <md-title-remainder>proceedings, 11-13 October 1999, Boston, Massachusetts</md-title-remainder>
 <md-date>1999</md-date>
 <md-description>&quot;IEEE catalog number 99EX370&quot;--T.p. verso</md-description></location>
-<relevance>30842</relevance>
+<relevance>35071</relevance>
 <recid>content: title eight international conference on computer communications and networks</recid>
 </hit>
 <hit>
@@ -218,7 +218,7 @@
 <md-date>2000</md-date>
 <md-author>Farley, Marc</md-author>
 <md-description>Includes index</md-description></location>
-<relevance>29028</relevance>
+<relevance>33008</relevance>
 <recid>content: title building storage networks author farley marc</recid>
 </hit>
 <hit>
@@ -234,7 +234,7 @@
 <md-date>1999</md-date>
 <md-author>Malaga, Ernie</md-author>
 <md-description>Includes index</md-description></location>
-<relevance>29028</relevance>
+<relevance>33008</relevance>
 <recid>content: title complete cl author malaga ernie</recid>
 </hit>
 <hit>
@@ -248,7 +248,7 @@
 <md-title-remainder>real-time rendering and software technology</md-title-remainder>
 <md-date>2001</md-date>
 <md-author>Watt, Alan H</md-author></location>
-<relevance>29028</relevance>
+<relevance>33008</relevance>
 <recid>content: title d games author watt alan h</recid>
 </hit>
 <hit>
@@ -260,7 +260,7 @@
 <md-title>Java applications strategies for the AS/400</md-title>
 <md-date>1999</md-date>
 <md-author>Denoncourt, Don</md-author></location>
-<relevance>29028</relevance>
+<relevance>33008</relevance>
 <recid>content: title java applications strategies for the as author denoncourt don</recid>
 </hit>
 <hit>
@@ -275,7 +275,7 @@
 <md-author>Loudon, Kyle</md-author>
 <md-description>&quot;Useful techniques from sorting to encryption&quot;--Cover</md-description>
 <md-description>Includes index</md-description></location>
-<relevance>29028</relevance>
+<relevance>33008</relevance>
 <recid>content: title mastering algorithms with c author loudon kyle</recid>
 </hit>
 </show>
\ No newline at end of file
diff --git a/test/test_turbomarcxml_4.res b/test/test_turbomarcxml_4.res
index d21e518..cbf7a34 100644
--- a/test/test_turbomarcxml_4.res
+++ b/test/test_turbomarcxml_4.res
@@ -19,7 +19,7 @@ under development to replace the printed Bibliography of Marine Geology</md-desc
 <md-description tag="513">1692-PRESENT</md-description>
 <md-test-usersetting-2>test-usersetting-2 data: 
 </md-test-usersetting-2></location>
-<relevance>9416</relevance>
+<relevance>11882</relevance>
 <recid>content: title bibliography of maine geology author medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_turbomarcxml_7.res b/test/test_turbomarcxml_7.res
index 1a1a40b..5268bf3 100644
--- a/test/test_turbomarcxml_7.res
+++ b/test/test_turbomarcxml_7.res
@@ -12,7 +12,7 @@
  name="gils" checksum="2074161109">
 <md-title>BIBLIOGRAPHY OF MAINE GEOLOGY</md-title>
 <md-description>This data base is a computer based bibliography of marine geology.  It allows searching by topic and geographic location, similar to GEOREF.  It is currently under development to replace the printed Bibliography of Marine Geology</md-description></location>
-<relevance>9416</relevance>
+<relevance>11882</relevance>
 <recid>content: title bibliography of maine geology</recid>
 </hit>
 <hit>
diff --git a/test/test_url_3.res b/test/test_url_3.res
index b907948..6a73ea2 100644
--- a/test/test_url_3.res
+++ b/test/test_url_3.res
@@ -17,7 +17,7 @@
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>25286</relevance>
+<relevance>48160</relevance>
 <recid>content: title how to program a computer author jack collins medium book</recid>
 </hit>
 <hit>
@@ -30,7 +30,7 @@
 <md-date>1973-1980</md-date>
 <md-description tag="500">Hebrew and Greek; introductions in English</md-description>
 <md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description></location>
-<relevance>21072</relevance>
+<relevance>40134</relevance>
 <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -42,7 +42,7 @@
 <md-title>Computer science &amp; technology</md-title>
 <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
 <md-date>1977</md-date></location>
-<relevance>15804</relevance>
+<relevance>30100</relevance>
 <recid>content: title computer science technology author medium book</recid>
 </hit>
 <hit>
@@ -54,7 +54,7 @@
 <md-title>A plan for community college computer development</md-title>
 <md-date>1971</md-date>
 <md-description tag="500">Cover title</md-description></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
@@ -70,7 +70,7 @@
 <md-date>1971</md-date>
 <md-author>Englund, Carl R</md-author>
 <md-description tag="500">&quot;Contract DOT-UT-10003.&quot;</md-description></location>
-<relevance>9030</relevance>
+<relevance>17200</relevance>
 <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
 </hit>
 <hit>
@@ -87,7 +87,7 @@
 <md-author>Mairs, John W</md-author>
 <md-description tag="500">Scale of maps ca. 1:1,000,000</md-description>
 <md-description tag="504">Bibliography: p. 4</md-description></location>
-<relevance>8780</relevance>
+<relevance>16722</relevance>
 <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -101,7 +101,7 @@
 <md-title-remainder>the proceedings of a workshop</md-title-remainder>
 <md-date>1974</md-date>
 <md-description tag="504">Includes bibliographical references and index</md-description></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
@@ -113,7 +113,7 @@
 <md-title>The use of passwords for controlled access to computer resources</md-title>
 <md-date>1977</md-date>
 <md-author>Wood, Helen M</md-author></location>
-<relevance>6321</relevance>
+<relevance>12040</relevance>
 <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
diff --git a/test/test_url_6.res b/test/test_url_6.res
index f9081d6..e072116 100644
--- a/test/test_url_6.res
+++ b/test/test_url_6.res
@@ -13,7 +13,7 @@
 <md-title>APPLIED GEOLOGY FILE</md-title>
 <md-description tag="520">Reports and memorandums completed by the Site Investigation Section comprise this data set.  Subjects include geotechnical appraisal of public facility sites before and during construction and evaluations of hazardous waste problems</md-description>
 <md-description tag="513">1970-PRESENT</md-description></location>
-<relevance>3923</relevance>
+<relevance>6707</relevance>
 <recid>content: title applied geology file author medium book</recid>
 </hit>
 <hit>
@@ -24,7 +24,7 @@
 <md-title>UTAH GEOLOGICAL AND MINERAL SURVEY PUBLICATIONS</md-title>
 <md-description tag="520">Publications of the Utah Geological and Mineral Survey include reports of investigation, special studies, bulletins, open-file reports, geologic map of Utah, publications of geological societies, geologic and oil and mineral maps, coal monographs, circulars, water resource bulletins, and reprints of articles</md-description>
 <md-description tag="513">-PRESENT</md-description></location>
-<relevance>2896</relevance>
+<relevance>4951</relevance>
 <recid>content: title utah geological and mineral survey publications author medium book</recid>
 </hit>
 <hit>
-- 
1.7.10.4