diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl
new file mode 100644
index 000000000..3f08f55db
--- /dev/null
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl
@@ -0,0 +1,16 @@
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<#-- Template for displaying search error message -->
+
+<#if title??>
+	<div class="errorPageTitle">
+  	  <h2>${title?html}</h2>
+	</div>
+</#if>
+<div id="nomatchingTitle">
+	<p>
+		${message?html}
+	</p>
+</div>
+<#include "searchSelector.ftl">
+<#include "search-help.ftl" >
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl
new file mode 100644
index 000000000..e892f96df
--- /dev/null
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl
@@ -0,0 +1,49 @@
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<#if origination?has_content && origination == "helpLink">
+<div id="searchTipsTitleH2">
+    <h2>Search Tips</h2>
+</div>
+    <span id="searchHelp">
+        <a href="#" onClick="history.back();return false;" title="back to results">Back to results</a>
+    </span>
+<#else>
+<div id="searchTipsTitleH3">
+    <h3>Search Tips</h3>
+</div>
+</#if>
+<ul class="searchTips">
+    <li>Keep it simple! Use short, single terms unless your searches are returning too many results.</li>
+    <li>Use quotes to search for an entire phrase -- e.g., "<i>protein folding</i>".</li>
+    <li>Except for boolean operators, searches are <strong>not</strong> case-sensitive, so "Geneva" and "geneva" are equivalent</li>
+    <li>If you are unsure of the correct spelling, put ~ at the end of your search term -- e.g., <i>cabage~</i> finds <i>cabbage</i>, <i>steven~</i> finds <i>Stephen</i> and <i>Stefan</i> (as well as other similar names).</li>
+</ul>
+
+<div id="advancedTipsWrapper">
+<h4><a id="advTipsLink" href="#">Advanced Tips</a></h4>
+</div>
+<ul id="advanced" class="searchTips" style="visibility:hidden">
+    <li>When you enter more than one term, search will return results containing all of them unless you add the Boolean "OR" -- e.g., <i>chicken</i> OR <i>egg</i>.</li>
+    <li>NOT" can help limit searches -- e.g., <i>climate</i> NOT <i>change</i>.</li>
+    <li>Phrase searches may be combined with Boolean operators -- e.g. "<i>climate change</i>" OR "<i>global warming</i>".</li>
+    <li>Close word variations will also be found -- e.g., <i>sequence</i> matches <i>sequences</i> and <i>sequencing</i>.</li>
+    <li>Use the wildcard * character to match an even wider variation -- e.g., <i>nano*</i> will match both <i>nanotechnology</i> and <i>nanofabrication</i>.</li>
+    <li>Search uses shortened versions of words -- e.g., a search for <i>cogniti*</i> finds nothing, while <i>cognit*</i> finds both <i>cognitive</i> and <i>cognition</i>.</li>
+</ul>
+<a id="closeLink" href="#"  style="visibility:hidden;font-size:.825em;padding-left:8px">Close</a>
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/search.css" />')}
+<script type="text/javascript">
+    $(document).ready(function(){
+        $('a#advTipsLink').click(function() {
+           $('ul#advanced').css("visibility","visible");
+           $('a#closeLink').css("visibility","visible");
+           $('a#closeLink').click(function() {
+              $('ul#advanced').css("visibility","hidden");
+              $('a#closeLink').css("visibility","hidden");
+              return false;
+           });
+           return false;
+        });
+    });
+
+</script>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
new file mode 100644
index 000000000..81e28024d
--- /dev/null
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
@@ -0,0 +1,251 @@
+<#-- $This file is distributed under the terms of the license in LICENSE$ -->
+
+<#-- Template for displaying paged search results -->
+
+<h2 class="searchResultsHeader">
+
+<#include "searchSelector.ftl">
+
+<#escape x as x?html>
+    <div id='searchQueryResults'> ${i18n().search_results_for} '${querytext}'</div>
+    <div id='limitedToClassGroup'> <#if classGroupName?has_content>${i18n().limited_to_type} '${classGroupName}'</#if> </div>
+    <div id='limitedToType'> <#if typeName?has_content>${i18n().limited_to_type} '${typeName}'</#if> </div>
+</#escape>
+<script type="text/javascript">
+	var url = window.location.toString();
+	if (url.indexOf("?") == -1){
+		var queryText = 'querytext=${querytext}';
+	} else {
+		var urlArray = url.split("?");
+		var queryText = urlArray[1];
+	}
+
+	var urlsBase = '${urls.base}';
+</script>
+
+	<img id="downloadIcon" src="images/download-icon.png" alt="${i18n().download_results}" title="${i18n().download_results}" />
+<#-- <span id="downloadResults" style="float:left"></span>  -->
+</h2>
+
+<span id="searchHelp"><a href="${urls.base}/searchHelp" title="${i18n().search_help}">${i18n().not_expected_results}</a></span>
+<div class="contentsBrowseGroup">
+
+    <#-- Refinement links -->
+    <#if classGroupLinks?has_content && classGroupLinks?size gt 1>
+        <div class="searchTOC">
+            <h4>${i18n().display_only}</h4>
+            <ul>
+            <#list classGroupLinks as link>
+                <li><a href="${link.url}" title="${i18n().class_group_link}">${link.text}</a><span>(${link.count})</span></li>
+            </#list>
+            </ul>
+        </div>
+    </#if>
+
+    <#if classLinks?has_content && classLinks?size gt 1 >
+        <div class="searchTOC">
+            <#if classGroupName?has_content>
+                <h4>${i18n().limit} ${classGroupName} ${i18n().to}</h4>
+            <#else>
+                <h4>${i18n().limit_to}</h4>
+            </#if>
+            <ul>
+            <#list classLinks as link>
+                <li><a href="${link.url}" title="${i18n().class_link}">${link.text}</a><span>(${link.count})</span></li>
+            </#list>
+            </ul>
+        </div>
+    </#if>
+
+
+    <div class="virtualArticleSwitch">
+      <label class="switch">Показать виртуальную статью
+        <input id="virtualArticleCheck" type="checkbox" checked="false" onclick="showVirtualArticles();">
+	  </label>
+      <#if user.loggedIn>
+		  <button onclick="createNewCompilation()">Сохранить/button>
+	  </#if>
+    </div>
+
+
+    
+    <#-- Search results -->
+    <ul class="searchhits">
+        <#list individuals as individual>
+            <li>
+            	<@shortView uri=individual.uri viewContext="search" />
+            </li>
+        </#list>
+    </ul>
+
+
+    <#-- Paging controls -->
+    <#if (pagingLinks?size > 0)>
+        <div class="searchpages">
+            ${i18n().pages}:
+            <#if prevPage??><a class="prev" href="${prevPage}" title="${i18n().previous}">${i18n().previous}</a></#if>
+            <#list pagingLinks as link>
+                <#if link.url??>
+                    <a href="${link.url}" title="${i18n().page_link}">${link.text}</a>
+                <#else>
+                    <span>${link.text}</span> <#-- no link if current page -->
+                </#if>
+            </#list>
+            <#if nextPage??><a class="next" href="${nextPage}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a></#if>
+        </div>
+    </#if>
+    <br />
+
+    <#-- VIVO OpenSocial Extension by UCSF -->
+    <#if openSocial??>
+        <#if openSocial.visible>
+        <h3>OpenSocial</h3>
+            <script type="text/javascript" language="javascript">
+                // find the 'Search' gadget(s).
+                var searchGadgets = my.findGadgetsAttachingTo("gadgets-search");
+                var keyword = '${querytext}';
+                // add params to these gadgets
+                if (keyword) {
+                    for (var i = 0; i < searchGadgets.length; i++) {
+                        var searchGadget = searchGadgets[i];
+                        searchGadget.additionalParams = searchGadget.additionalParams || {};
+                        searchGadget.additionalParams["keyword"] = keyword;
+                    }
+                }
+                else {  // remove these gadgets
+                    my.removeGadgets(searchGadgets);
+                }
+            </script>
+
+            <div id="gadgets-search" class="gadgets-gadget-parent" style="display:inline-block"></div>
+        </#if>
+    </#if>
+
+</div> <!-- end contentsBrowseGroup -->
+
+<script>
+  document.addEventListener('DOMContentLoaded', createVirtualCompilation(), false);
+  
+  $('input[type=checkbox]').removeAttr('checked');
+    function showVirtualArticles(){
+      var checkBox = document.getElementById("virtualArticleCheck");
+      if (checkBox.checked == true){
+        $('.searchResult').hide();
+        $('.virtualArticlePart').show();
+      } else {
+        $('.searchResult').show();
+        $('.virtualArticlePart').hide();
+      }
+    }
+    
+	function createNewCompilation() {
+   	    var excerpts = $('.compilationDraftExcerpt').toArray();
+	    if (excerpts.length == 0){
+	       alert("Отрывков не найдено.");
+	       return;
+	    }
+	    var compilationName = window.prompt("Введите название подборки");
+	    if (!compilationName){
+	       alert("Для создания подоборки необходимо ввести её название.");
+	       return;
+	    }
+	    var iframe = document.createElement("iframe");
+	    var excerptsCounter = $('.compilationDraftExcerpt').length;
+	    iframe.setAttribute("src", "${urls.base}/editRequestDispatch?typeOfNew=https%3A%2F%2Flitvinovg.pro%2Ftext_structures%23compilation&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.CompilationGenerator&excerptsCount=" + excerptsCounter);
+	    iframe.style.width = "1px";
+	    iframe.style.height = "1px";
+	    iframe.id="newCompilationIframe";
+	    //iframe.style.display="none";
+	    document.body.appendChild(iframe);
+	    $('#newCompilationIframe').on('load', function(){
+	      fillOutForm(compilationName);
+	    });
+	  }
+	  
+	function fillOutForm(compilationName){
+	    var iframeDoc = document.getElementById('newCompilationIframe').contentWindow.document;
+	    var rules = $('#builder').queryBuilder('getRules');
+		var query = format_query_string(rules,"");
+   	    iframeDoc.getElementById('queryBuilderRules').value = JSON.stringify(rules);
+   	    iframeDoc.getElementById('rawQueryString').value = query;
+
+
+	    iframeDoc.getElementById('newCompilationLabel').value = compilationName;
+	    var excerpts = $('.compilationDraftExcerpt').toArray();
+	    for (i = 0;i < excerpts.length;i++){
+	      var excerptUri = excerpts[i].getAttribute('parturi');
+	      var excerptName = $(excerpts[i]).children('button').html();
+	      var number = i + 1;
+	      iframeDoc.getElementById("tocLevel" + number + "Name").value = excerptName + " (" + compilationName + ")";
+	      iframeDoc.getElementById("tocItem" + number + "Name").value = excerptName + " (" + compilationName + ")";
+	      iframeDoc.getElementById("excerpt" + number).value = excerptUri;
+	    }
+	    $('#newCompilationIframe').off('load');
+	    iframeDoc.getElementById('submit').click();
+	    $('#newCompilationIframe').on('load', function(){
+	      redirectToNewCompilation();
+	    });
+	
+	  }
+	function redirectToNewCompilation(){
+	  var newURL = document.getElementById('newCompilationIframe').contentWindow.location.href;
+	  window.open(newURL,"_self");
+	}
+
+  function createVirtualCompilation(){
+      let workSet = new Set(); 
+	  let biblioSet = new Set(); 
+	  var workDivs = $('.virtualArticleWork');
+	  var biblioDivs = $('.virtualArticleBibliography');
+	  biblioDivs.each(function() {
+	   biblioSet.add($(this).html());
+	  });
+	  workDivs.each(function() {
+	   workSet.add($(this).html());
+	  });
+	  var workArr = Array.from(workSet);
+	  workArr.sort();
+	  var biblioArr = Array.from(biblioSet);
+	  biblioArr.sort();
+	  if (workArr.length > 0 ) {
+	    $('<div class="virtualWorks virtualArticlePart"><button type="button" style="border:none;width: 100%; text-align:left;" class="collapsible">Источники</button><div class="virtualWorks"></div></div>').insertAfter($('.virtualArticlePart').last());
+	    for (let value of workArr){
+	      $('.virtualWorks').last().append( '<div class="work"><p>' + value + '</p></div>' );
+	    }
+	  }
+	  if (biblioArr.length > 0 ) {
+	    $('<div class="virtualBibliography virtualArticlePart"><button type="button" style="border:none;width: 100%; text-align:left;" class="collapsible">Литература</button><div class="virtualBibliography"></div></div>').insertAfter($('.virtualArticlePart').last());
+	    for (let value of biblioArr){
+	      $('.virtualBibliography').last().append( '<div class="bibliography"><p>' + value + '</p></div>' );
+	    }
+	  }
+	  $('.virtualWorks').hide();
+	  $('.virtualBibliography').hide();
+	  $('.virtualArticlePart').hide();
+	  var coll = document.getElementsByClassName("collapsible");
+	  var i;
+	  for (i = 0; i < coll.length; i++) {
+	    coll[i].addEventListener("click", function() {
+	      this.classList.toggle("active");
+	      var content = this.nextElementSibling;
+	      if (content.style.display === "block") {
+	        content.style.display = "none";
+	      } else {
+	        content.style.display = "block";
+	      }
+	    });
+	  }
+  }
+  
+</script>
+
+${stylesheets.add('<link rel="stylesheet" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />',
+  				  '<link rel="stylesheet" href="${urls.base}/css/search.css" />',
+                  '<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />')}
+
+${headScripts.add('<script src="//code.jquery.com/ui/1.10.3/jquery-ui.js"></script>',
+				  '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>',
+                  '<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>'
+                  )}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/searchDownload.js"></script>')}