diff --git a/templates/ktcore/search2/adv_query_builder.smarty b/templates/ktcore/search2/adv_query_builder.smarty
index 5fca80a..7ae92ec 100755
--- a/templates/ktcore/search2/adv_query_builder.smarty
+++ b/templates/ktcore/search2/adv_query_builder.smarty
@@ -766,7 +766,12 @@ function butSearchClick()
 <fieldset>
 	<legend>{i18n}Advanced Search{/i18n}</legend>
 
+{capture assign=options}
+<a href="{$rootUrl}/search2.php?action=queryBuilder">Search Criteria Editor</a>
+{/capture}
 
+{i18n arg_options=$options}The #options# may also be used to create more complex search criteria expressions.{/i18n}
+<br><br>
 {capture assign=options}
 <select id="allop">
 <option value="AND">{i18n}all{/i18n}
diff --git a/templates/ktcore/search2/adv_query_search.smarty b/templates/ktcore/search2/adv_query_search.smarty
index 5a494a0..ce694e4 100755
--- a/templates/ktcore/search2/adv_query_search.smarty
+++ b/templates/ktcore/search2/adv_query_search.smarty
@@ -1,7 +1,14 @@
-<h2>{i18n}Query Editor{/i18n}</h2>
+<h2>{i18n}Search Criteria Editor{/i18n}</h2>
 
 <p class="descriptiveText">
-{i18n}The query editor allows you to utilise the full power of the KnowledgeTree search engine by entering comprehensive expressions.{/i18n}
+{i18n}The search criteria editor allows you to utilise the full power of the KnowledgeTree search engine by allowing you to perform more complicated searches by using the free text criteria format.{/i18n}
+
+{capture assign=options}
+<a href="{$rootUrl}/search2.php?action=guiBuilder">Advanced Search</a>
+{/capture}
+<p>
+{i18n arg_options=$options}The #options# may also be used to perform searches.{/i18n}
+
 <P>
 <div>
 <table>
@@ -111,6 +118,8 @@ function txtQueryChange(el)
 </script>
 {/literal}
 <legend>{i18n}Advanced Query{/i18n}</legend>
+
+
 <form  id=frmQuery name=frmQuery method="POST" action="{addQS}action=process{/addQS}">
 <textarea id="txtAdvQuery" name="txtQuery" cols=50 rows=10 onkeypress="txtQueryChange(this)">{$txtQuery}</textarea>
 <br/>
@@ -139,11 +148,11 @@ function txtQueryChange(el)
 <fieldset>
 
 <legend>{i18n}Grammar{/i18n}</legend>
-{i18n}Expressions may be built up using the following grammar:{/i18n}<br/>
+{i18n}Criteria may be built up using the following grammar:{/i18n}<br/>
 expr ::= expr {literal}{{/literal} AND | OR {literal}}{/literal} expr<br/>
 expr ::= NOT expr<br/>
 expr ::= (expr)<br/>
-expr ::= expr {literal}{ < | <= | = | > | >= | CONTAINS |STARTS WITH | ENDS WITH }{/literal} value<br/>
+expr ::= field {literal}{ < | <= | = | > | >= | CONTAINS |STARTS WITH | ENDS WITH }{/literal} value<br/>
 expr ::= field BETWEEN value AND value<br/>
 expr ::= field DOES [ NOT ] CONTAIN value<br/>
 expr ::= field IS [ NOT ] LIKE value<br/>
@@ -167,12 +176,11 @@ sq.value += word + ' ';
 
 <fieldset>
 <legend>{i18n}Fields{/i18n}</legend>
-{i18n}The following fields may be used in expressions:{/i18n}
+{i18n}The following fields may be used in search criteria:{/i18n}
 {assign var=i value=0}
 {foreach item=alias from=$aliases}
 {if (substr($alias,0,2) != '["')}
 {if $i>0}, {/if}
-
 {if (($i % 8) == 0)}<br>{/if}
 <span onclick="wordclicked('{$alias|escape}')">{$alias}</span>
 {assign var=i value=$i+1}
diff --git a/templates/ktcore/search2/lucene_migration.smarty b/templates/ktcore/search2/lucene_migration.smarty
index 258fdd0..2e1000b 100644
--- a/templates/ktcore/search2/lucene_migration.smarty
+++ b/templates/ktcore/search2/lucene_migration.smarty
@@ -1,5 +1,5 @@
 <P>
-{i18n}Migration to using the new search requires text to be moved from the database full text indexes into the Lucene indexes. This may take some time depending
+{i18n}Migration to using the new search requires text to be moved from the database full text indexes into the Document Indexer Service. This may take some time depending
 on the size of the repository. For this reason, the process is a background task.{/i18n}
 <P>
 
diff --git a/templates/ktcore/search2/lucene_statistics.smarty b/templates/ktcore/search2/lucene_statistics.smarty
index 6be2f38..1fc1c54 100644
--- a/templates/ktcore/search2/lucene_statistics.smarty
+++ b/templates/ktcore/search2/lucene_statistics.smarty
@@ -1,5 +1,5 @@
 <P>
-{i18n}This dashlet provides some basic statistics on the Lucene index.{/i18n}
+{i18n}This dashlet provides some basic statistics from the KnowledgeTree Document Indexer.{/i18n}
 <P>
 
 <table>
@@ -18,7 +18,7 @@
 <tr><td valign=top>*<td>{i18n}Not all documents contain text. This will explain why the indexing coverage percentage my vary.{/i18n}
 <tr><td valign=top>*<td>{i18n}The queue coverage indicates how many documents are in the queue in relation to the repository size.{/i18n}
 {if $stats.noOptimisation}
-<tr><td valign=top>*<td><i>{i18n}To get the best performance out of Lucene, the indexes must be optimised periodically. This is managed by a background task.{/i18n}
+<tr><td valign=top>*<td><i>{i18n}To get the best performance out of Document Indexer, the indexes must be optimised periodically. This is managed by a background task.{/i18n}
 {/if}
 </table>
 <table width="100%">