diff --git a/fairchive-persistence/src/main/resources/Bundle_en.properties b/fairchive-persistence/src/main/resources/Bundle_en.properties
index cbddaf38e0..2af817130a 100755
--- a/fairchive-persistence/src/main/resources/Bundle_en.properties
+++ b/fairchive-persistence/src/main/resources/Bundle_en.properties
@@ -1043,7 +1043,7 @@ dataverse.results.btn.addData=Add Data
 dataverse.results.btn.addData.newDataverse=New Collection
 dataverse.results.btn.addData.newDataset=New Dataset
 dataverse.results.btn.saveToFile=Save to File
-dataverse.results.msg.tooManyResults=There are too many results to save them to a file. Try to limit the number of results to a maximum of {0}.
+dataverse.results.msg.tooManyResults=There are too many items to save them to a file. Try to limit them to a maximum of {0}.
 dataverse.results.dialog.addDataGuest.header=Add Data
 dataverse.results.dialog.addDataGuest.msg=You need to <a href="/loginpage.xhtml{0}" title="Log into your account in the repository">Log In</a> to create a collection or add a dataset.
 dataverse.results.dialog.addDataGuest.msg.signup=You need to <a href="/loginpage.xhtml{0}" title="Log into or sign up for an account in the repository">Log In/Sign Up</a> to create a collection or add a dataset.
@@ -1065,7 +1065,7 @@ account.results.empty.browse.loggedin.perms.zero=Here you will see your collecti
 dataverse.results.empty.browse.loggedin.perms.hidden=There are no collections within this collection. You can add to it by using the Add Data button on this page.
 dataverse.results.empty.link.technicalDetails=More technical details
 dataverse.search.facet.error=There was an error with your search parameters. Please <a href="/dataverse/{0}">clear your search</a> and try again.
-dataverse.results.count.toofresults={0} to {1} of {2} {2, choice, 0#Results|1#Result|2#Results}
+dataverse.results.count.toofresults={0} to {1} of {2} {2, choice, 0#Items|1#Item|2#Items}
 dataverse.results.paginator.current=(Current)
 dataverse.results.btn.sort=Sort
 dataverse.results.btn.sort.option.nameAZ=Name (<span class="sr-only">From A To Z</span><span aria-hidden="true">A-Z</span>)
diff --git a/fairchive-persistence/src/main/resources/Bundle_pl.properties b/fairchive-persistence/src/main/resources/Bundle_pl.properties
index 5143ca6a54..23b72e298f 100644
--- a/fairchive-persistence/src/main/resources/Bundle_pl.properties
+++ b/fairchive-persistence/src/main/resources/Bundle_pl.properties
@@ -1018,7 +1018,7 @@ dataverse.results.btn.addData=Dodaj dane
 dataverse.results.btn.addData.newDataverse=Nowa kolekcja
 dataverse.results.btn.addData.newDataset=Nowy zbi\u00F3r danych
 dataverse.results.btn.saveToFile=Zapisz do pliku
-dataverse.results.msg.tooManyResults=Wynik\u00F3w jest zbyt wiele aby zapisa\u0107 je do pliku. Spr\u00F3buj ograniczy\u0107 ich liczb\u0119 do maksymalnie  {0}.
+dataverse.results.msg.tooManyResults=Za du\u017Co elementów, aby zapisa\u0107 je do pliku. Spr\u00F3buj ograniczy\u0107 ich liczb\u0119 do maksymalnie  {0}.
 dataverse.results.dialog.addDataGuest.header=Dodaj dane
 dataverse.results.dialog.addDataGuest.msg=By utworzy\u0107 kolekcj\u0119 lub doda\u0107 zbi\u00F3r danych musisz si\u0119 <a href="/loginpage.xhtml{0}" title="Zaloguj si\u0119 na swoje konto w repozytorium">zalogowa\u0107</a> .
 dataverse.results.dialog.addDataGuest.msg.signup=By utworzy\u0107 kolekcj\u0119 lub doda\u0107 zbi\u00F3r danych, musisz si\u0119 <a href="/loginpage.xhtml{0}" title="Zaloguj si\u0119 lub za\u0142\u00F3\u017C konto w repozytorium">zalogowa\u0107/zarejestrowa\u0107</a>.
@@ -1040,7 +1040,7 @@ account.results.empty.browse.loggedin.perms.zero=W tym miejscu zobaczysz swoje k
 dataverse.results.empty.browse.loggedin.perms.hidden=Ta kolekcja nie zawiera \u017Cadnych kolekcji. Mo\u017Cesz je doda\u0107 korzystaj\u0105c z przycisku "Dodaj dane" na tej stronie.
 dataverse.results.empty.link.technicalDetails=Wi\u0119cej szczeg\u00F3\u0142\u00F3w technicznych
 dataverse.search.facet.error=Wyst\u0105pi\u0142 b\u0142\u0105d dotycz\u0105cy Twoich parametr\u00F3w wyszukiwania. <a href="/dataverse/{0}">Usu\u0144 parametry wyszukiwania</a> i spr\u00F3buj ponownie.
-dataverse.results.count.toofresults=Od {0} do {1} z {2} {2,choice,0#Wynik\u00F3w|1#Wyniku|1<Wynik\u00F3w}
+dataverse.results.count.toofresults=Od {0} do {1} z {2} {2,choice,0#Element\u00F3w|1#Elementu|1<Element\u00F3w}
 dataverse.results.paginator.current=(Aktualna)
 dataverse.results.btn.sort=Sortuj
 dataverse.results.btn.sort.option.nameAZ=Nazwa (<span class="sr-only">Od A Do Zet</span><span aria-hidden="true">A-Z</span>)
diff --git a/fairchive-webapp/src/main/webapp/search-include-fragment.xhtml b/fairchive-webapp/src/main/webapp/search-include-fragment.xhtml
index c7f00e6862..5af99cf507 100644
--- a/fairchive-webapp/src/main/webapp/search-include-fragment.xhtml
+++ b/fairchive-webapp/src/main/webapp/search-include-fragment.xhtml
@@ -10,37 +10,55 @@
                 xmlns:jsf="http://xmlns.jcp.org/jsf"
                 xmlns:dv="http://dataverse.org/facelets">
 
-    <o:importConstants type="edu.harvard.iq.dataverse.persistence.datafile.license.FileTermsOfUse.TermsOfUseType" var="termsOfUseTypeEnum"/>
-    <o:importConstants type="edu.harvard.iq.dataverse.search.query.SearchObjectType" var="searchObjectTypeEnum"/>
-    <o:importConstants type="edu.harvard.iq.dataverse.search.SearchIncludeFragment" var="searchConstants"/>
+    <o:importConstants type="edu.harvard.iq.dataverse.persistence.datafile.license.FileTermsOfUse.TermsOfUseType" 
+                       var="termsOfUseTypeEnum"/>
+    <o:importConstants type="edu.harvard.iq.dataverse.search.query.SearchObjectType" 
+                       var="searchObjectTypeEnum"/>
+    <o:importConstants type="edu.harvard.iq.dataverse.search.SearchIncludeFragment" 
+                       var="searchConstants"/>
 
     <c:set var="page" value="/dataverse/#{SearchIncludeFragment.dataverse.alias}"/>
 
     <!--@elvariable id="friendlyNames" type="java.util.List<java.lang.String>"-->
 
     <!-- Search Form + Add Data Button -->
-    <div class="row panelSearchForm" jsf:rendered="#{!SearchIncludeFragment.solrIsDown}">
+    <div class="row panelSearchForm" 
+         jsf:rendered="#{!SearchIncludeFragment.solrIsDown}">
         <div class="top-search-form-wrapper">
             <h:form>
                 <div class="top-search-form">
                     <h:inputHidden value="#{SearchIncludeFragment.dataverseAlias}" />
 
-                    <h:outputLabel styleClass="sr-only" value="#{bundle['dataverse.search.label']}" for="searchBasic" />
-                    <p:inputText id="searchBasic" styleClass="search-input" size="40" value="#{SearchIncludeFragment.query}" onkeypress="if (event.keyCode == 13) { submitsearch(); return false; }"/>
-                    <p:watermark for="searchBasic" value="#{bundle['dataverse.search.input.watermark']}"/>
-                    <p:commandLink id="searchbutton" styleClass="btn btn-default btn-access" action="#{SearchIncludeFragment.searchRedirect()}">
+                    <h:outputLabel styleClass="sr-only" 
+                                   value="#{bundle['dataverse.search.label']}" 
+                                   for="searchBasic" />
+                    <p:inputText id="searchBasic" 
+                                 styleClass="search-input" 
+                                 size="40" 
+                                 value="#{SearchIncludeFragment.query}" 
+                                 onkeypress="if (event.keyCode == 13) { submitsearch(); return false; }"/>
+                    <p:watermark for="searchBasic" 
+                                 value="#{bundle['dataverse.search.input.watermark']}"/>
+                    <p:commandLink id="searchbutton" 
+                                   styleClass="btn btn-default btn-access" 
+                                   action="#{SearchIncludeFragment.searchRedirect()}">
                         <span class="glyphicon glyphicon-search"/> #{bundle['dataverse.search.btn.find']}
                     </p:commandLink>
-                    <p:remoteCommand name="submitsearch" action="#{SearchIncludeFragment.searchRedirect()}"/>
+                    <p:remoteCommand name="submitsearch" 
+                                     action="#{SearchIncludeFragment.searchRedirect()}"/>
                 </div>
                 <div class="top-search-form-extra-buttons">
-                    <h:outputLink id="advsearchlink" class="search-bar-url" value="#{widgetWrapper.wrapURL('/search/advanced.xhtml')}">
-                        <f:param name="dataverseIdentifier" value="#{SearchIncludeFragment.dataverse.alias}"/>
+                    <h:outputLink id="advsearchlink" 
+                                  class="search-bar-url" 
+                                  value="#{widgetWrapper.wrapURL('/search/advanced.xhtml')}">
+                        <f:param name="dataverseIdentifier" 
+                                 value="#{SearchIncludeFragment.dataverse.alias}"/>
                         <h:outputText value="#{bundle['dataverse.search.advancedSearch']}"/>
                     </h:outputLink>
                     <ui:repeat value="#{settingsWrapper.getConfigureSearchBarUrls().entrySet().toArray()}"
                                var="url">
-                        <span class="top-search-form-extra-buttons-separator" aria-hidden="true">|</span>
+                        <span class="top-search-form-extra-buttons-separator" 
+                              aria-hidden="true"/>
                         <h:outputLink value="#{url.key}"
                                       target="_blank"
                                       title="#{bundle['opensInNewTab']}">
@@ -49,25 +67,38 @@
                     </ui:repeat>
                 </div>
             </h:form>
-            <div class="col-manage-action" jsf:rendered="#{!widgetWrapper.widgetView}">
+            <div class="col-manage-action" 
+                 jsf:rendered="#{!widgetWrapper.widgetView}">
                 <div class="button-block pull-right">
                     <!-- ADD DATA -->
                     <ui:fragment rendered="#{!dataverseSession.user.authenticated and SearchIncludeFragment.couldCreateDatasetOrDataverseIfWasAuthenticated()}">
-                        <button type="button" class="btn btn-default btn-access" onclick="primeFacesShowModal('addData_popup', this)">
-                            <span class="glyphicon glyphicon-plus" aria-hidden="true"/> #{bundle['dataverse.results.btn.addData']}
+                        <button type="button" 
+                                class="btn btn-default btn-access" 
+                                onclick="primeFacesShowModal('addData_popup', this)">
+                            <span class="glyphicon glyphicon-plus" 
+                                  aria-hidden="true"/> #{bundle['dataverse.results.btn.addData']}
                         </button>
                     </ui:fragment>
-                    <h:form id="addDataForm" class="btn-form"
+                    <h:form id="addDataForm" 
+                            class="btn-form"
                             rendered="#{dataverseSession.user.authenticated and
                                      (permissionsWrapper.canIssueCreateDataverseCommand(SearchIncludeFragment.dataverse)
                                      or (permissionsWrapper.canIssueCreateDatasetCommand(SearchIncludeFragment.dataverse)
                                         and settingsWrapper.isShowAddDatasetButtonOnDataversePage()))}">
                         <div class="btn-group">
-                            <button id="addData" type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown"
-                                    aria-haspopup="true" aria-expanded="false">
-                                <span class="glyphicon glyphicon-plus" aria-hidden="true"/> #{bundle['dataverse.results.btn.addData']} <span class="caret"></span>
+                            <button id="addData" 
+                                    type="button" 
+                                    class="btn btn-default btn-access dropdown-toggle" 
+                                    data-toggle="dropdown"
+                                    aria-haspopup="true" 
+                                    aria-expanded="false">
+                                <span class="glyphicon glyphicon-plus" 
+                                      aria-hidden="true"/> #{bundle['dataverse.results.btn.addData']} <span class="caret"></span>
                             </button>
-                            <ul id="addDataMenu" class="dropdown-menu pull-right text-left" role="menu" aria-labelledby="addData">
+                            <ul id="addDataMenu" 
+                                class="dropdown-menu pull-right text-left" 
+                                role="menu" 
+                                aria-labelledby="addData">
                                 <ui:fragment rendered="#{permissionsWrapper.canIssueCreateDataverseCommand(SearchIncludeFragment.dataverse) }">
                                     <li role="none">
                                         <a href="${pageContext.request.contextPath}/createEditDataverse.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}&amp;dataverseOwnerAlias=#{SearchIncludeFragment.dataverse.alias}"
@@ -94,116 +125,163 @@
     </div>
 
     <!-- Message Block / SOLR IS DOWN -->
-    <div class="row" jsf:rendered="#{SearchIncludeFragment.solrIsDown}">
+    <div class="row" 
+         jsf:rendered="#{SearchIncludeFragment.solrIsDown}">
         <div class="col-sm-12">
             <div class="bg-danger padding-12 margin-bottom">
                 <span class="glyphicon glyphicon-warning-sign text-danger"/>&#160;
-
-                <h:outputText value="#{SearchIncludeFragment.searchException.message}" styleClass="text-danger highlightBold"/>
-
-                <h:outputText value=" - #{bundle['dataverse.results.solrIsDown']}" styleClass="text-danger"/>
+                <h:outputText value="#{SearchIncludeFragment.searchException.message}" 
+                              styleClass="text-danger highlightBold"/>
+                <h:outputText value=" - #{bundle['dataverse.results.solrIsDown']}" 
+                              styleClass="text-danger"/>
             </div>
             <pre><h:outputText value="#{SearchIncludeFragment.searchException.cause.message}"/></pre>
         </div>
     </div>
 
     <!-- Search Results / SOLR IS UP -->
-    <div id="search-row-panel" class="row row-offcanvas row-offcanvas-left" jsf:rendered="#{!SearchIncludeFragment.solrIsDown}">
-        <div id="dv-sidebar" class="col-sm-4 col-md-3 sidebar-offcanvas">
+    <div id="search-row-panel" 
+         class="row row-offcanvas row-offcanvas-left" 
+         jsf:rendered="#{!SearchIncludeFragment.solrIsDown}">
+        <div id="dv-sidebar" 
+             class="col-sm-4 col-md-3 sidebar-offcanvas">
             <h2>#{bundle['dataverse.search.filters.header']}</h2>
 
             <!--TYPE FACET (DATAVERSES, DATASETS, FILES)-->
-            <h:form id="facetType" styleClass="clearfix">
+            <h:form id="facetType" 
+                    styleClass="clearfix">
                 <h:inputHidden value="#{SearchIncludeFragment.dataverseAlias}" />
 
                 <div class="clearfix">
-                    <p:selectBooleanCheckbox id="checkDataverses" value="#{SearchIncludeFragment.selectedTypesMap[searchObjectTypeEnum.DATAVERSES]}"
-                            styleClass="facetTypeChBox" onchange="updateApplyTypeFacetDisabledState();">
+                    <p:selectBooleanCheckbox id="checkDataverses"
+                                             value="#{SearchIncludeFragment.selectedTypesMap[searchObjectTypeEnum.DATAVERSES]}"
+                                             styleClass="facetTypeChBox" 
+                                             onchange="updateApplyTypeFacetDisabledState();">
                     </p:selectBooleanCheckbox>
 
                     <i class="icon-dataverse text-icon-inline"></i>
 
-                    <p:outputLabel for="checkDataverses" styleClass="facetTypeLink chkbox-label-margin">
-                        <h:outputFormat styleClass="facetTypeDataverse" value="#{bundle['dataverse.results.types.dataverses']} &#40;{0}&#41;">
+                    <p:outputLabel for="checkDataverses" 
+                                   styleClass="facetTypeLink chkbox-label-margin">
+                        <h:outputFormat styleClass="facetTypeDataverse" 
+                                        value="#{bundle['dataverse.results.types.dataverses']} &#40;{0}&#41;">
                             <f:param value="#{SearchIncludeFragment.facetCountDataverses}"/>
                         </h:outputFormat>
                     </p:outputLabel>
                 </div>
 
                 <div class="clearfix">
-                    <p:selectBooleanCheckbox id="checkDatasets" value="#{SearchIncludeFragment.selectedTypesMap[searchObjectTypeEnum.DATASETS]}"
-                        styleClass="facetTypeChBox" onchange="updateApplyTypeFacetDisabledState();">
+                    <p:selectBooleanCheckbox id="checkDatasets" 
+                                             value="#{SearchIncludeFragment.selectedTypesMap[searchObjectTypeEnum.DATASETS]}"
+                                             styleClass="facetTypeChBox"
+                                             onchange="updateApplyTypeFacetDisabledState();">
                     </p:selectBooleanCheckbox>
 
                     <i class="icon-dataset text-icon-inline"></i>
 
-                    <p:outputLabel for="checkDatasets" styleClass="facetTypeLink chkbox-label-margin">
-                        <h:outputFormat styleClass="facetTypeDataset" value="#{bundle['dataverse.results.types.datasets']} &#40;{0}&#41;">
+                    <p:outputLabel for="checkDatasets" 
+                                   styleClass="facetTypeLink chkbox-label-margin">
+                        <h:outputFormat styleClass="facetTypeDataset" 
+                                        value="#{bundle['dataverse.results.types.datasets']} &#40;{0}&#41;">
                             <f:param value="#{SearchIncludeFragment.facetCountDatasets}"/>
                         </h:outputFormat>
                     </p:outputLabel>
                 </div>
 
                 <div class="clearfix">
-                    <p:selectBooleanCheckbox id="checkFiles" value="#{SearchIncludeFragment.selectedTypesMap[searchObjectTypeEnum.FILES]}"
-                        styleClass="facetTypeChBox" onchange="updateApplyTypeFacetDisabledState();">
+                    <p:selectBooleanCheckbox id="checkFiles" 
+                                             value="#{SearchIncludeFragment.selectedTypesMap[searchObjectTypeEnum.FILES]}"
+                                             styleClass="facetTypeChBox" 
+                                             onchange="updateApplyTypeFacetDisabledState();">
                     </p:selectBooleanCheckbox>
 
                     <i class="icon-file text-icon-inline"></i>
 
-                    <p:outputLabel for="checkFiles" styleClass="facetTypeLink chkbox-label-margin">
-                        <h:outputFormat styleClass="facetTypeFile" value="#{bundle['dataverse.results.types.files']} &#40;{0}&#41;">
+                    <p:outputLabel for="checkFiles" 
+                                   styleClass="facetTypeLink chkbox-label-margin">
+                        <h:outputFormat styleClass="facetTypeFile" 
+                                        value="#{bundle['dataverse.results.types.files']} &#40;{0}&#41;">
                             <f:param value="#{SearchIncludeFragment.facetCountFiles}"/>
                         </h:outputFormat>
                     </p:outputLabel>
                 </div>
 
                 <div class="pull-right">
-                    <p:commandButton id="applyTypeFacetsButton" widgetVar="applyTypeFacetsButton" value="#{bundle.apply}"
-                            action="#{SearchIncludeFragment.searchWithSelectedTypesRedirect()}" />
+                    <p:commandButton id="applyTypeFacetsButton" 
+                                     widgetVar="applyTypeFacetsButton" 
+                                     value="#{bundle.apply}"
+                                     action="#{SearchIncludeFragment.searchWithSelectedTypesRedirect()}" />
                 </div>
             </h:form>
 
             <!--NON-TYPE FACETS-->
-            <h:form id="facetCategoryForm" rendered="#{SearchIncludeFragment.searchResultsCount > 0}">
-                <p:dataList id="facetCategoryList" value="#{SearchIncludeFragment.facetCategoryList}" var="facetCategory">
-                    <h:outputText value="#{facetCategory.displayName}" styleClass="facetCategoryName" escape="false"/>
+            <h:form id="facetCategoryForm" 
+                    rendered="#{SearchIncludeFragment.searchResultsCount > 0}">
+                <p:dataList id="facetCategoryList" 
+                            value="#{SearchIncludeFragment.facetCategoryList}" 
+                            var="facetCategory">
+                    <h:outputText value="#{facetCategory.displayName}" 
+                                  styleClass="facetCategoryName" 
+                                  escape="false"/>
 
                     <div class="ui-datalist ui-widget">
                         <div class="ui-datalist-content ui-widget-content">
                             <ul class="ui-datalist-data">
-                                <ui:repeat var="facetLabel" value="#{facetCategory.facetLabels}" varStatus="facetLabelStatus">
+                                <ui:repeat var="facetLabel" 
+                                           value="#{facetCategory.facetLabels}" 
+                                           varStatus="facetLabelStatus">
                                     <li class="ui-datalist-item facet-item #{facetLabelStatus.index ge 5 ? 'hidden-content' : ''}">
-                                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" rendered="#{!SearchIncludeFragment.filterQueries.contains(facetLabel.filterQuery)}" styleClass="facetLink">
+                                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                                      rendered="#{!SearchIncludeFragment.filterQueries.contains(facetLabel.filterQuery)}" 
+                                                      styleClass="facetLink">
                                             <h:outputFormat value="#{facetLabel.displayName} &#40;{0}&#41; ">
                                                 <f:param value="#{facetLabel.count}"/>
                                             </h:outputFormat>
-                                            <h:outputText styleClass="sr-only" value=" #{facetCategory.displayName}: #{bundle['dataverse.search.filters.add.screenReaderPostfix']}" />
-
-                                            <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                                            <f:param name="fq#{SearchIncludeFragment.filterQueries.size()}" value="#{facetLabel.filterQuery}"/>
-                                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                                                <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
+                                            <h:outputText styleClass="sr-only" 
+                                                          value=" #{facetCategory.displayName}: #{bundle['dataverse.search.filters.add.screenReaderPostfix']}" />
+
+                                            <f:param name="q" 
+                                                     value="#{SearchIncludeFragment.query}"/>
+                                            <f:param name="fq#{SearchIncludeFragment.filterQueries.size()}" 
+                                                     value="#{facetLabel.filterQuery}"/>
+                                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                                       var="clickedFilterQuery" 
+                                                       varStatus="status">
+                                                <f:param name="fq#{status.index}" 
+                                                         value='#{clickedFilterQuery}'/>
                                             </c:forEach>
-                                            <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
-                                            <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
-                                            <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
+                                            <f:param name="types" 
+                                                     value="#{SearchIncludeFragment.selectedTypesString}"/>
+                                            <f:param name="sort" 
+                                                     value="#{SearchIncludeFragment.sortField}"/>
+                                            <f:param name="order" 
+                                                     value="#{SearchIncludeFragment.sortOrder}"/>
                                         </h:outputLink>
 
-                                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" rendered="#{SearchIncludeFragment.filterQueries.contains(facetLabel.filterQuery)}" styleClass="facetLink facetSelected">
+                                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                                      rendered="#{SearchIncludeFragment.filterQueries.contains(facetLabel.filterQuery)}" 
+                                                      styleClass="facetLink facetSelected">
                                             <h:outputFormat value="#{facetLabel.displayName} &#40;{0}&#41;">
                                                 <f:param value="#{facetLabel.count}"/>
                                             </h:outputFormat>
-                                            <h:outputText styleClass="sr-only" value=" #{facetCategory.displayName}: #{bundle['dataverse.search.filters.remove.screenReaderPostfix']}" />
+                                            <h:outputText styleClass="sr-only" 
+                                                          value=" #{facetCategory.displayName}: #{bundle['dataverse.search.filters.remove.screenReaderPostfix']}" />
 
-                                            <span class="glyphicon glyphicon-remove"></span>
+                                            <span class="glyphicon glyphicon-remove"/>
                                             <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                                                <f:param name="fq#{status.index}" value='#{clickedFilterQuery}' disable="#{clickedFilterQuery == facetLabel.filterQuery}"/>
+                                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                                       var="clickedFilterQuery" 
+                                                       varStatus="status">
+                                                <f:param name="fq#{status.index}" 
+                                                         value='#{clickedFilterQuery}' 
+                                                         disable="#{clickedFilterQuery == facetLabel.filterQuery}"/>
                                             </c:forEach>
-                                            <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
-                                            <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
-                                            <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
+                                            <f:param name="types" 
+                                                     value="#{SearchIncludeFragment.selectedTypesString}"/>
+                                            <f:param name="sort" 
+                                                     value="#{SearchIncludeFragment.sortField}"/>
+                                            <f:param name="order" 
+                                                     value="#{SearchIncludeFragment.sortOrder}"/>
                                         </h:outputLink>
                                     </li>
                                 </ui:repeat>
@@ -213,18 +291,25 @@
 
                     <ui:fragment rendered="#{facetCategory.name != searchConstants.SEARCH_FIELD_TYPE and facetCategory.name != searchConstants.SEARCH_FIELD_SUBTREE}">
                         <div class="clearfix">
-                            <div class="pull-left hidden-content" jsf:rendered="#{facetCategory.facetLabels.size() gt 5}">
+                            <div class="pull-left hidden-content" 
+                                 jsf:rendered="#{facetCategory.facetLabels.size() gt 5}">
                                 <a href="#" data-facet-link="show-less">
-                                    <h:outputText styleClass="sr-only" value="#{bundle['dataverse.search.filters.showMoreLess.screenReaderPrefix']} " />
+                                    <h:outputText styleClass="sr-only" 
+                                                  value="#{bundle['dataverse.search.filters.showMoreLess.screenReaderPrefix']} " />
                                     #{bundle.less}
-                                    <h:outputText styleClass="sr-only" value=" #{bundle['dataverse.search.filters.showMoreLess.screenReaderPostfix']} #{facetCategory.displayName}" />
+                                    <h:outputText styleClass="sr-only" 
+                                                  value=" #{bundle['dataverse.search.filters.showMoreLess.screenReaderPostfix']} #{facetCategory.displayName}" />
                                 </a>
                             </div>
-                            <div class="pull-right" jsf:rendered="#{facetCategory.facetLabels.size() gt 5}">
-                                <a href="#" data-facet-link="show-more">
-                                    <h:outputText styleClass="sr-only" value="#{bundle['dataverse.search.filters.showMoreLess.screenReaderPrefix']}" />
+                            <div class="pull-right" 
+                                 jsf:rendered="#{facetCategory.facetLabels.size() gt 5}">
+                                <a href="#" 
+                                   data-facet-link="show-more">
+                                    <h:outputText styleClass="sr-only" 
+                                                  value="#{bundle['dataverse.search.filters.showMoreLess.screenReaderPrefix']}" />
                                     #{bundle.more}
-                                    <h:outputText styleClass="sr-only" value=" #{bundle['dataverse.search.filters.showMoreLess.screenReaderPostfix']} #{facetCategory.displayName}" />
+                                    <h:outputText styleClass="sr-only"
+                                                  value=" #{bundle['dataverse.search.filters.showMoreLess.screenReaderPostfix']} #{facetCategory.displayName}" />
                                 </a>
                             </div>
                         </div>
@@ -232,23 +317,28 @@
                 </p:dataList>
             </h:form>
         </div>
-        <div id="dv-main" class="col-sm-8 col-md-9">
+        <div id="dv-main" 
+             class="col-sm-8 col-md-9">
 
             <!--toggle sidebar button-->
             <p class="visible-xs-block">
-                <button type="button" class="btn btn-primary btn-xs" data-toggle="offcanvas" aria-expanded="false">
+                <button type="button" 
+                        class="btn btn-primary btn-xs" 
+                        data-toggle="offcanvas"
+                        aria-expanded="false">
                     <i class="glyphicon glyphicon-chevron-left"></i>
                     <span class="show-hide-text">#{bundle.show}</span> #{bundle['dataverse.search.filters.showHideBtn.postfix']}
                 </button>
             </p>
 
-            <h2>#{bundle['dataverse.results.header']}</h2>
-
             <!-- Message for zero results -->
-            <div id="emptyResults" class="emptyResults bg-warning" jsf:rendered="#{(empty SearchIncludeFragment.searchResultsList) and (!SearchIncludeFragment.wasSolrErrorEncountered())}">
+            <div id="emptyResults" 
+                 class="emptyResults bg-warning" 
+                 jsf:rendered="#{(empty SearchIncludeFragment.searchResultsList) and (!SearchIncludeFragment.wasSolrErrorEncountered())}">
                 <!--SEARCH ZERO COUNTS-->
                 <ui:fragment rendered="#{!empty SearchIncludeFragment.query and SearchIncludeFragment.facetCountDataverses eq 0 and SearchIncludeFragment.facetCountDatasets eq 0 and SearchIncludeFragment.facetCountFiles eq 0}">
-                    <p><h:outputFormat value="#{bundle['dataverse.results.empty.zero']}" escape="false">
+                    <p><h:outputFormat value="#{bundle['dataverse.results.empty.zero']}" 
+                                       escape="false">
                         <f:param value="#{settingsWrapper.guidesBaseUrl}"/>
                         <f:param value="#{settingsWrapper.guidesVersion}"/>
                     </h:outputFormat></p>
@@ -257,16 +347,22 @@
                     <!--THIS IS EMPTY / SEARCH-->
                     <ui:fragment rendered="#{SearchIncludeFragment.facetCountDataverses gt 0 or SearchIncludeFragment.facetCountDatasets gt 0 or SearchIncludeFragment.facetCountFiles gt 0}">
                         <!--SEARCH HIDDEN-->
-                        <p><h:outputFormat value="#{bundle['dataverse.results.empty.hidden']}" escape="false">
+                        <p><h:outputFormat value="#{bundle['dataverse.results.empty.hidden']}" 
+                                           escape="false">
                             <f:param value="#{settingsWrapper.guidesBaseUrl}"/>
                             <f:param value="#{settingsWrapper.guidesVersion}"/>
                         </h:outputFormat></p>
                     </ui:fragment>
                     <ui:fragment rendered="#{SearchIncludeFragment.errorFromSolr != null}">
                         <p>
-                            <a data-toggle="collapse" data-parent="#emptyResults" href="#technicalDetails" aria-expanded="true" aria-controls="technicalDetails">[+] #{bundle['dataverse.results.empty.link.technicalDetails']}</a>
+                            <a data-toggle="collapse"
+                               data-parent="#emptyResults"
+                               href="#technicalDetails"
+                               aria-expanded="true"
+                               aria-controls="technicalDetails">[+] #{bundle['dataverse.results.empty.link.technicalDetails']}</a>
                         </p>
-                        <div id="technicalDetails" class="collapse">
+                        <div id="technicalDetails" 
+                             class="collapse">
                             <pre><h:outputText value="#{SearchIncludeFragment.errorFromSolr}"/></pre>
                         </div>
                     </ui:fragment>
@@ -321,7 +417,8 @@
                 </ui:fragment>
             </div>
 
-            <div id="resultsFacetsTopBlock" jsf:rendered="#{!empty SearchIncludeFragment.filterQueries}">
+            <div id="resultsFacetsTopBlock" 
+                 jsf:rendered="#{!empty SearchIncludeFragment.filterQueries}">
                 <ui:fragment rendered="#{(SearchIncludeFragment.wasSolrErrorEncountered())}">
                     <div class="row">
                         <div class="col-sm-12">
@@ -334,16 +431,25 @@
                     </div>
                 </ui:fragment>
 
-                <ui:repeat value="#{SearchIncludeFragment.responseFilterQueries}" var="filterQuery" rendered="#{!SearchIncludeFragment.wasSolrErrorEncountered()}">
+                <ui:repeat value="#{SearchIncludeFragment.responseFilterQueries}"
+                           var="filterQuery"
+                           rendered="#{!SearchIncludeFragment.wasSolrErrorEncountered()}">
 
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" styleClass="facetLink facetSelected" rendered="#{filterQuery.hasFriendlyNameAndValue()}">
-                        <h:outputText value="#{filterQuery.friendlyFieldName}: " escape="false"/>
+                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}"
+                                  styleClass="facetLink facetSelected"
+                                  rendered="#{filterQuery.hasFriendlyNameAndValue()}">
+                        <h:outputText value="#{filterQuery.friendlyFieldName}: "/>
                         <h:outputText value="#{filterQuery.friendlyFieldValue} " />
-                        <h:outputText styleClass="sr-only" value=" #{bundle['dataverse.search.filters.remove.screenReaderPostfix']}" />
-                        <span class="glyphicon glyphicon-remove"></span>
+                        <h:outputText styleClass="sr-only" 
+                                      value=" #{bundle['dataverse.search.filters.remove.screenReaderPostfix']}" />
+                        <span class="glyphicon glyphicon-remove"/>
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                        <c:forEach items="#{SearchIncludeFragment.responseFilterQueries}" var="clickedFilterQuery" varStatus="status">
-                            <f:param name="fq#{status.index}" value='#{clickedFilterQuery.query}' disable="#{clickedFilterQuery.query == filterQuery.query}"/>
+                        <c:forEach items="#{SearchIncludeFragment.responseFilterQueries}" 
+                                   var="clickedFilterQuery" 
+                                   varStatus="status">
+                            <f:param name="fq#{status.index}" 
+                                     value='#{clickedFilterQuery.query}' 
+                                     disable="#{clickedFilterQuery.query == filterQuery.query}"/>
                         </c:forEach>
                         <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
                         <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
@@ -390,16 +496,22 @@
     </div>
 
 
-    <p:dialog header="#{bundle['dataverse.results.dialog.addDataGuest.header']}" widgetVar="addData_popup" modal="true">
+    <p:dialog header="#{bundle['dataverse.results.dialog.addDataGuest.header']}" 
+              widgetVar="addData_popup" 
+              modal="true">
         <p class="help-block">
             <span class="glyphicon glyphicon-warning-sign text-danger"/>
-            <h:outputFormat styleClass="text-danger" value="#{dataverseHeaderFragment.signupAllowed ? bundle['dataverse.results.dialog.addDataGuest.msg.signup'] : bundle['dataverse.results.dialog.addDataGuest.msg']}" escape="false">
+            <h:outputFormat styleClass="text-danger" 
+                            value="#{dataverseHeaderFragment.signupAllowed ? bundle['dataverse.results.dialog.addDataGuest.msg.signup'] : bundle['dataverse.results.dialog.addDataGuest.msg']}" escape="false">
                 <f:param value="#{navigationWrapper.redirectPage}"/>
                 <f:param value="#{dataverseHeaderFragment.getSignupUrl(navigationWrapper.redirectPage)}"/>
             </h:outputFormat>
         </p>
         <div class="button-block">
-            <button type="button" onclick="PF('addData_popup').hide()" class="btn btn-default" value="#{bundle.close}">
+            <button type="button" 
+                    onclick="PF('addData_popup').hide()" 
+                    class="btn btn-default" 
+                    value="#{bundle.close}">
                 #{bundle.close}
             </button>
         </div>
diff --git a/fairchive-webapp/src/main/webapp/search-include-pager.xhtml b/fairchive-webapp/src/main/webapp/search-include-pager.xhtml
index 5a9c247d86..5037d3f973 100644
--- a/fairchive-webapp/src/main/webapp/search-include-pager.xhtml
+++ b/fairchive-webapp/src/main/webapp/search-include-pager.xhtml
@@ -14,14 +14,19 @@
                 <ul class="pagination">
                     <!--should take you to page 1-->
                     <li class="#{SearchIncludeFragment.page == '1' ? 'disabled' : ''}">
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" disabled="#{SearchIncludeFragment.page == '1'}">
+                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                      disabled="#{SearchIncludeFragment.page == '1'}">
                             <h:outputText value="&#171; "/>
                             <h:outputText styleClass="sr-only"
-                                 value=" #{bundle['dataverse.results.page.screenReader.firstPrefix']} #{bundle['dataverse.results.page.screenReader']} " />
+                                          value=" #{bundle['dataverse.results.page.screenReader.firstPrefix']} #{bundle['dataverse.results.page.screenReader']} " />
                             
-                            <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                                <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
+                            <f:param name="q" 
+                                     value="#{SearchIncludeFragment.query}"/>
+                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                       var="clickedFilterQuery" 
+                                       varStatus="status">
+                                <f:param name="fq#{status.index}" 
+                                         value='#{clickedFilterQuery}'/>
                             </c:forEach>
                             <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
                             <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
@@ -30,14 +35,19 @@
                         </h:outputLink>
                     </li>
                     <li class="#{SearchIncludeFragment.page == '1' ? 'disabled' : ''}">
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" disabled="#{SearchIncludeFragment.page == '1'}">
+                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                      disabled="#{SearchIncludeFragment.page == '1'}">
                             <h:outputText value="&lt; #{bundle['dataverse.results.page.previous']} "/>
                             <h:outputText styleClass="sr-only"
-                                 value=" #{bundle['dataverse.results.page.screenReader']} " />
+                                          value=" #{bundle['dataverse.results.page.screenReader']} " />
                             
-                            <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                                <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
+                            <f:param name="q" 
+                                     value="#{SearchIncludeFragment.query}"/>
+                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                       var="clickedFilterQuery" 
+                                       varStatus="status">
+                                <f:param name="fq#{status.index}" 
+                                         value='#{clickedFilterQuery}'/>
                             </c:forEach>
                             <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
                             <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
@@ -54,14 +64,18 @@
                                     <f:convertNumber pattern="###,###" />
                                 </h:outputText>
                                 <h:outputText styleClass="sr-only"
-                                    value=" #{bundle['dataverse.results.page.screenReader']} " />
+                                              value=" #{bundle['dataverse.results.page.screenReader']} " />
                                 <h:outputText styleClass="sr-only"
-                                    value=" #{bundle['dataverse.results.paginator.current']} "
-                                    rendered="#{SearchIncludeFragment.page == pageStatus.index}" />
+                                              value=" #{bundle['dataverse.results.paginator.current']} "
+                                              rendered="#{SearchIncludeFragment.page == pageStatus.index}" />
                                 
-                                <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                                <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                                    <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
+                                <f:param name="q" 
+                                         value="#{SearchIncludeFragment.query}"/>
+                                <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                           var="clickedFilterQuery" 
+                                           varStatus="status">
+                                    <f:param name="fq#{status.index}" 
+                                             value='#{clickedFilterQuery}'/>
                                 </c:forEach>
                                 <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
                                 <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
@@ -71,14 +85,19 @@
                         </li>
                     </c:forEach>
                     <li class="#{SearchIncludeFragment.page == SearchIncludeFragment.totalPages ? 'disabled' : ''}">
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" disabled="#{SearchIncludeFragment.page == SearchIncludeFragment.totalPages}">
+                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                      disabled="#{SearchIncludeFragment.page == SearchIncludeFragment.totalPages}">
                             <h:outputText value="#{bundle['dataverse.results.page.next']} &gt; "/>
                             <h:outputText styleClass="sr-only"
-                                 value=" #{bundle['dataverse.results.page.screenReader']} " />
+                                          value=" #{bundle['dataverse.results.page.screenReader']} " />
                             
-                            <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                                <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
+                            <f:param name="q" 
+                                     value="#{SearchIncludeFragment.query}"/>
+                            <c:forEach items="#{SearchIncludeFragment.filterQueries}"
+                                       var="clickedFilterQuery" 
+                                       varStatus="status">
+                                <f:param name="fq#{status.index}"
+                                         value='#{clickedFilterQuery}'/>
                             </c:forEach>
                             <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
                             <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
@@ -87,13 +106,16 @@
                         </h:outputLink>
                     </li>
                     <li class="#{SearchIncludeFragment.page == SearchIncludeFragment.totalPages ? 'disabled' : ''}">
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" disabled="#{SearchIncludeFragment.page == SearchIncludeFragment.totalPages}">
+                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                      disabled="#{SearchIncludeFragment.page == SearchIncludeFragment.totalPages}">
                             <h:outputText value="&#187; "/>
                             <h:outputText styleClass="sr-only"
                                  value=" #{bundle['dataverse.results.page.screenReader.lastPrefix']} #{bundle['dataverse.results.page.screenReader']} " />
                             
                             <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
+                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                       var="clickedFilterQuery" 
+                                       varStatus="status">
                                 <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
                             </c:forEach>
                             <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
diff --git a/fairchive-webapp/src/main/webapp/search-results-list.xhtml b/fairchive-webapp/src/main/webapp/search-results-list.xhtml
index 84048a7090..9f84f9a504 100644
--- a/fairchive-webapp/src/main/webapp/search-results-list.xhtml
+++ b/fairchive-webapp/src/main/webapp/search-results-list.xhtml
@@ -10,10 +10,11 @@
                 xmlns:dv="http://dataverse.org/facelets">
 
 	<h:form style="display: inline;"
-	       rendered="#{SearchIncludeFragment.displaySaveToFileButton()}">
+	        rendered="#{SearchIncludeFragment.displaySaveToFileButton()}">
 		<p:commandButton id="downloadLink"
-			value="#{bundle['dataverse.results.btn.saveToFile']}" ajax="false"
-			action="#{SearchIncludeFragment.prepareSearchResults}">
+			             value="#{bundle['dataverse.results.btn.saveToFile']}" 
+			             ajax="false"
+			             action="#{SearchIncludeFragment.prepareSearchResults}">
 			<p:fileDownload value="#{SearchIncludeFragment.searchResultsFile}" />
 		</p:commandButton>
 	</h:form>
@@ -23,7 +24,9 @@
 	   </h:outputFormat>
 	</div>
 
-	<div id="resultsCountPaginatorBlock" class="row" jsf:rendered="#{SearchIncludeFragment.searchResultsCount > 0}">
+	<div id="resultsCountPaginatorBlock" 
+	     class="row" 
+	     jsf:rendered="#{SearchIncludeFragment.searchResultsCount > 0}">
     <!-- RESULTS COUNT -->
     <div class="results-count col-sm-6">
         <h:outputFormat value="#{bundle['dataverse.results.count.toofresults']}">
@@ -36,34 +39,63 @@
     <div class="results-sort-pagination col-sm-6">
         <!-- SORT BY -->
         <div class="btn-group pull-right">
-				<button id="sortResults" type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown"
-                    aria-haspopup="true" aria-controls="sortResultsMenu" aria-expanded="false">
-                <span class="glyphicon glyphicon-sort"/> #{bundle['dataverse.results.btn.sort']} <span class="caret"/>
+				<button id="sortResults" 
+				        type="button" 
+				        class="btn btn-default btn-access dropdown-toggle" 
+				        data-toggle="dropdown"
+                        aria-haspopup="true" 
+                        aria-controls="sortResultsMenu" 
+                        aria-expanded="false">
+                <span class="glyphicon glyphicon-sort"/>#{bundle['dataverse.results.btn.sort']}<span class="caret"/>
             </button>
-            <ul id="sortResultsMenu" class="dropdown-menu pull-right text-left" role="menu" aria-labelledby="sortResults">
+            <ul id="sortResultsMenu" 
+                class="dropdown-menu pull-right text-left" 
+                role="menu"
+                aria-labelledby="sortResults">
                 <li role="none">
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" role="menuitem">
-                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.nameAZ']}" styleClass="#{SearchIncludeFragment.sortedByNameAsc ? 'highlightBold' : ''}" escape="false"/>
-                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.current']}" styleClass="sr-only" rendered="#{SearchIncludeFragment.sortedByNameAsc}" />
-
-                        <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                        <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                            <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
+                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                  role="menuitem">
+                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.nameAZ']}" 
+                                      styleClass="#{SearchIncludeFragment.sortedByNameAsc ? 'highlightBold' : ''}" 
+                                      escape="false"/>
+                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.current']}"
+                                      styleClass="sr-only" 
+                                      rendered="#{SearchIncludeFragment.sortedByNameAsc}" />
+
+                        <f:param name="q" 
+                                 value="#{SearchIncludeFragment.query}"/>
+                        <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                   var="clickedFilterQuery" 
+                                   varStatus="status">
+                            <f:param name="fq#{status.index}" 
+                                     value='#{clickedFilterQuery}'/>
                         </c:forEach>
-                        <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
-                        <f:param name="page" value="1"/>
-                        <f:param name="sort" value="#{searchConstants.SEARCH_FIELD_NAME_SORT}"/>
-                        <f:param name="order" value="#{searchConstants.ASCENDING}"/>
+                        <f:param name="types" 
+                                 value="#{SearchIncludeFragment.selectedTypesString}"/>
+                        <f:param name="page" 
+                                 value="1"/>
+                        <f:param name="sort" 
+                                 value="#{searchConstants.SEARCH_FIELD_NAME_SORT}"/>
+                        <f:param name="order" 
+                                 value="#{searchConstants.ASCENDING}"/>
                     </h:outputLink>
                 </li>
                 <li role="none">
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" role="menuitem">
-                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.nameZA']}" styleClass="#{SearchIncludeFragment.sortedByNameDesc ? 'highlightBold' : ''}" escape="false"/>
-                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.current']}" styleClass="sr-only" rendered="#{SearchIncludeFragment.sortedByNameDesc}" />
+                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                  role="menuitem">
+                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.nameZA']}" 
+                                      styleClass="#{SearchIncludeFragment.sortedByNameDesc ? 'highlightBold' : ''}" 
+                                      escape="false"/>
+                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.current']}" 
+                                      styleClass="sr-only" 
+                                      rendered="#{SearchIncludeFragment.sortedByNameDesc}" />
 
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                        <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                            <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
+                        <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                   var="clickedFilterQuery" 
+                                   varStatus="status">
+                            <f:param name="fq#{status.index}" 
+                                     value='#{clickedFilterQuery}'/>
                         </c:forEach>
                         <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
                         <f:param name="page" value="1"/>
@@ -72,13 +104,22 @@
                     </h:outputLink>
                 </li>
                 <li role="none">
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" role="menuitem">
-                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.newest']}" styleClass="#{SearchIncludeFragment.sortedByReleaseDateDesc? 'highlightBold' : ''}" escape="false"/>
-                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.current']}" styleClass="sr-only" rendered="#{SearchIncludeFragment.sortedByReleaseDateDesc}" />
-
-                        <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                        <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                            <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
+                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                  role="menuitem">
+                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.newest']}" 
+                                      styleClass="#{SearchIncludeFragment.sortedByReleaseDateDesc? 'highlightBold' : ''}" 
+                                      escape="false"/>
+                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.current']}" 
+                                      styleClass="sr-only" 
+                                      rendered="#{SearchIncludeFragment.sortedByReleaseDateDesc}" />
+
+                        <f:param name="q" 
+                                 value="#{SearchIncludeFragment.query}"/>
+                        <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                   var="clickedFilterQuery" 
+                                   varStatus="status">
+                            <f:param name="fq#{status.index}" 
+                                     value='#{clickedFilterQuery}'/>
                         </c:forEach>
                         <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
                         <f:param name="page" value="1"/>
@@ -87,13 +128,21 @@
                     </h:outputLink>
                 </li>
                 <li role="none">
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" role="menuitem">
-                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.oldest']}" styleClass="#{SearchIncludeFragment.sortedByReleaseDateAsc? 'highlightBold' : ''}" escape="false"/>
-                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.current']}" styleClass="sr-only" rendered="#{SearchIncludeFragment.sortedByReleaseDateAsc}" />
+                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                  role="menuitem">
+                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.oldest']}" 
+                                      styleClass="#{SearchIncludeFragment.sortedByReleaseDateAsc? 'highlightBold' : ''}" 
+                                      escape="false"/>
+                        <h:outputText value="#{bundle['dataverse.results.btn.sort.option.current']}" 
+                                      styleClass="sr-only" 
+                                      rendered="#{SearchIncludeFragment.sortedByReleaseDateAsc}" />
 
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                        <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                            <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
+                        <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                   var="clickedFilterQuery" 
+                                   varStatus="status">
+                            <f:param name="fq#{status.index}" 
+                                     value='#{clickedFilterQuery}'/>
                         </c:forEach>
                         <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
                         <f:param name="page" value="1"/>
@@ -103,13 +152,21 @@
                 </li>
                 <ui:fragment rendered="#{!(empty SearchIncludeFragment.query)}">
                     <li role="none">
-                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" role="menuitem">
-                            <h:outputText value="#{bundle['dataverse.results.btn.sort.option.relevance']}" styleClass="#{SearchIncludeFragment.sortedByRelevance ? 'highlightBold' : ''}" escape="false"/>
-                            <h:outputText value="#{bundle['dataverse.results.btn.sort.option.current']}" styleClass="sr-only" rendered="#{SearchIncludeFragment.sortedByRelevance}" />
+                        <h:outputLink value="#{widgetWrapper.wrapURL(page)}" 
+                                      role="menuitem">
+                            <h:outputText value="#{bundle['dataverse.results.btn.sort.option.relevance']}" 
+                                          styleClass="#{SearchIncludeFragment.sortedByRelevance ? 'highlightBold' : ''}" 
+                                          escape="false"/>
+                            <h:outputText value="#{bundle['dataverse.results.btn.sort.option.current']}" 
+                                          styleClass="sr-only" 
+                                          rendered="#{SearchIncludeFragment.sortedByRelevance}" />
 
                             <f:param name="q" value="#{SearchIncludeFragment.query}"/>
-                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
-                                <f:param name="fq#{status.index}" value='#{clickedFilterQuery}'/>
+                            <c:forEach items="#{SearchIncludeFragment.filterQueries}" 
+                                       var="clickedFilterQuery" 
+                                       varStatus="status">
+                                <f:param name="fq#{status.index}" 
+                                         value='#{clickedFilterQuery}'/>
                             </c:forEach>
                             <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
                             <f:param name="page" value="1"/>
@@ -126,239 +183,424 @@
     <o:importFunctions type="org.omnifaces.el.functions.Strings" />
     <ui:param name="descriptionAbbreviationThreshold" value="280"/>
             <!--CARDS-->
-    <h:dataTable id="resultsTable" value="#{lastSearchValue.searchResultsList}" var="result"
+    <h:dataTable id="resultsTable" 
+                 value="#{lastSearchValue.searchResultsList}" 
+                 var="result"
                  rendered="#{!(empty lastSearchValue.searchResultsList)}">
     <h:column>
         <!--DATAVERSE CARDS-->
-        <div class="dataverseResult clearfix #{result.unpublishedState ? 'unpublished' : ''}" jsf:rendered="#{result.type eq searchObjectTypeEnum.DATAVERSES}">
-            <c:set var="dvUrl" value="/dataverse/#{result.dataverseAlias}"/>
-            <c:set var="dvUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? dvUrl : widgetWrapper.wrapURL(dvUrl)}" />
-            <c:set var="dvCardUrlsTarget" value="#{!lastSearchValue.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}" />
-            <c:set var="dvIsLinked" value="#{!lastSearchValue.rootDv and !result.isInTree}" />
-
-            <c:set var="dvParentUrl" value="/dataverse/#{result.dataverseParentAlias}"/>
-            <c:set var="dvParentUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? dvParentUrl : widgetWrapper.wrapURL(dvParentUrl)}"/>
+        <div class="dataverseResult clearfix #{result.unpublishedState ? 'unpublished' : ''}" 
+             jsf:rendered="#{result.type eq searchObjectTypeEnum.DATAVERSES}">
+            <c:set var="dvUrl"
+                   value="/dataverse/#{result.dataverseAlias}"/>
+            <c:set var="dvUrlFinal" 
+                   value="#{!lastSearchValue.rootDv and !result.isInTree ? dvUrl : widgetWrapper.wrapURL(dvUrl)}" />
+            <c:set var="dvCardUrlsTarget" 
+                   value="#{!lastSearchValue.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}" />
+            <c:set var="dvIsLinked" 
+                   value="#{!lastSearchValue.rootDv and !result.isInTree}" />
+
+            <c:set var="dvParentUrl" 
+                   value="/dataverse/#{result.dataverseParentAlias}"/>
+            <c:set var="dvParentUrlFinal" 
+                   value="#{!lastSearchValue.rootDv and !result.isInTree ? dvParentUrl : widgetWrapper.wrapURL(dvParentUrl)}"/>
 
 
             <div class="card-preview-icon-block text-center">
-                <h:outputLink value="#{dvUrlFinal}" target="#{dvCardUrlsTarget}" tabindex="-1"
+                <h:outputLink value="#{dvUrlFinal}" 
+                              target="#{dvCardUrlsTarget}" 
+                              tabindex="-1"
                               pt:aria-label="#{bundle.dataverse} #{result.name}">
-                    <h:graphicImage value="#{result.imageUrl}" rendered="#{!empty result.imageUrl}" alt="#{bundle['dataverse.results.cards.dataverse.logoPrefix']} #{result.name}"/>
-                    <span class="icon-dataverse text-brand" jsf:rendered="#{empty result.imageUrl}" role="img" aria-label="#{bundle.dataverse}"/>
+                    <h:graphicImage value="#{result.imageUrl}" 
+                                    rendered="#{!empty result.imageUrl}" 
+                                    alt="#{bundle['dataverse.results.cards.dataverse.logoPrefix']} #{result.name}"/>
+                    <span class="icon-dataverse text-brand" 
+                          jsf:rendered="#{empty result.imageUrl}" 
+                          role="img" 
+                          aria-label="#{bundle.dataverse}"/>
                 </h:outputLink>
             </div>
 
             <div class="card-content-container">
                 <div class="card-title-icon-block">
-                    <span class="icon-dataverse text-brand pull-right" title="#{bundle.dataverse}" role="img" aria-label="#{bundle.dataverse}" />
-                    <span class="glyphicon glyphicon-new-window text-brand pull-right" title="#{bundle.harvested}" jsf:rendered="#{result.harvested}" role="img" aria-label="#{bundle.harvested}" />
-                    <span class="glyphicon glyphicon-link text-brand pull-right" title="#{bundle.linked}" jsf:rendered="#{dvIsLinked}" role="img" aria-label="#{bundle.linked}" />
+                    <span class="icon-dataverse text-brand pull-right" 
+                          title="#{bundle.dataverse}" 
+                          role="img" 
+                          aria-label="#{bundle.dataverse}" />
+                    <span class="glyphicon glyphicon-new-window text-brand pull-right" 
+                          title="#{bundle.harvested}" 
+                          jsf:rendered="#{result.harvested}" 
+                          role="img" 
+                          aria-label="#{bundle.harvested}" />
+                    <span class="glyphicon glyphicon-link text-brand pull-right" 
+                          title="#{bundle.linked}" 
+                          jsf:rendered="#{dvIsLinked}" 
+                          role="img" 
+                          aria-label="#{bundle.linked}" />
                     <div class="label-container pull-right">
-                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{result.draftState}"/>
-                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{result.unpublishedState}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" 
+                                      styleClass="label label-primary" 
+                                      rendered="#{result.draftState}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" 
+                                      styleClass="label label-warning" 
+                                      rendered="#{result.unpublishedState}"/>
                     </div>
 
-                    <h:outputLink value="#{dvUrlFinal}" target="#{dvCardUrlTarget}">
-                        <h:outputText value="#{bundle.dataverse}" styleClass="sr-only" />
-                        <h:outputText value="#{result.name}" rendered="#{result.nameHighlightSnippet == null}"/>
-                        <h:outputText value="#{result.nameHighlightSnippet}" rendered="#{result.nameHighlightSnippet != null}" escape="false"/>
+                    <h:outputLink value="#{dvUrlFinal}" 
+                                  target="#{dvCardUrlTarget}">
+                        <h:outputText value="#{bundle.dataverse}" 
+                                      styleClass="sr-only" />
+                        <h:outputText value="#{result.name}" 
+                                      rendered="#{result.nameHighlightSnippet == null}"/>
+                        <h:outputText value="#{result.nameHighlightSnippet}" 
+                                      rendered="#{result.nameHighlightSnippet != null}" 
+                                      escape="false"/>
                     </h:outputLink>
-                    <h:outputText value="(#{result.dataverseAffiliation})" styleClass="text-muted" style="margin-left: .5em;" rendered="#{!empty result.dataverseAffiliation and result.dataverseAffiliationHighlightSnippet == null}"/>
-                    <h:outputText value="(#{result.dataverseAffiliationHighlightSnippet})" styleClass="text-muted" style="margin-left: .5em;" rendered="#{result.dataverseAffiliationHighlightSnippet != null}" escape="false"/>
+                    <h:outputText value="(#{result.dataverseAffiliation})" 
+                                  styleClass="text-muted" 
+                                  style="margin-left: .5em;" 
+                                  rendered="#{!empty result.dataverseAffiliation and result.dataverseAffiliationHighlightSnippet == null}"/>
+                    <h:outputText value="(#{result.dataverseAffiliationHighlightSnippet})" 
+                                  styleClass="text-muted" 
+                                  style="margin-left: .5em;" 
+                                  rendered="#{result.dataverseAffiliationHighlightSnippet != null}" 
+                                  escape="false"/>
                 </div>
 
-                <h:outputText value="#{dv:formatDate(result.releaseOrCreateDate)}" styleClass="text-muted" style="margin-right:.5em;"/>
+                <h:outputText value="#{dv:formatDate(result.releaseOrCreateDate)}" 
+                              styleClass="text-muted" 
+                              style="margin-right:.5em;"/>
 
-                <h:outputLink value="#{dvParentUrlFinal}" target="#{dvCardUrlsTarget}" rendered="#{result.parent.id != lastSearchValue.dataverseId}">
-                    <h:outputText value="#{bundle.dataverse}" styleClass="sr-only" />
+                <h:outputLink value="#{dvParentUrlFinal}" 
+                              target="#{dvCardUrlsTarget}" 
+                              rendered="#{result.parent.id != lastSearchValue.dataverseId}">
+                    <h:outputText value="#{bundle.dataverse}" 
+                                  styleClass="sr-only" />
                     <h:outputText value="#{result.parent.name}"/>
                 </h:outputLink>
 
                 <hr style="margin:.5em;border:0;"/>
 
-                <h:outputText value="#{Strings:abbreviate(result.descriptionNoSnippet, descriptionAbbreviationThreshold)}" rendered="#{result.descriptionSnippets.size() eq 0}"/>
+                <h:outputText value="#{Strings:abbreviate(result.descriptionNoSnippet, descriptionAbbreviationThreshold)}" 
+                              rendered="#{result.descriptionSnippets.size() eq 0}"/>
 
-                <ui:repeat value="#{result.descriptionSnippets}" var="snippet" varStatus="varStatus"
+                <ui:repeat value="#{result.descriptionSnippets}" 
+                           var="snippet" 
+                           varStatus="varStatus"
                            rendered="#{result.descriptionSnippets.size() gt 0}">
-                    <h:outputText value="#{snippet}" escape="false"/>
-                    <h:outputText value="... " rendered="#{varStatus.last != true}"/>
+                    <h:outputText value="#{snippet}" 
+                                  escape="false"/>
+                    <h:outputText value="... " 
+                                  rendered="#{varStatus.last != true}"/>
                 </ui:repeat>
 
-                <ui:repeat value="#{result.highlightsAsList}" var="highlight" rendered="#{result.highlightsAsList.size() gt 0}">
-                    <ui:repeat value="#{highlight.snippets}" var="snippet">
+                <ui:repeat value="#{result.highlightsAsList}" 
+                           var="highlight" 
+                           rendered="#{result.highlightsAsList.size() gt 0}">
+                    <ui:repeat value="#{highlight.snippets}" 
+                               var="snippet">
                         <div>
-                            <h:outputText value="#{highlight.solrField.nameSearchable}: #{snippet}" escape="false"/>
-                            <ui:param value="#{highlight.solrField.nameFacetable}:intentional" name="unfriendly"/>
+                            <h:outputText value="#{highlight.solrField.nameSearchable}: #{snippet}" 
+                                          escape="false"/>
+                            <ui:param value="#{highlight.solrField.nameFacetable}:intentional" 
+                                      name="unfriendly"/>
                         </div>
                     </ui:repeat>
                 </ui:repeat>
             </div>
         </div>
         <!--DATASET CARDS-->
-        <div class="datasetResult clearfix #{result.unpublishedState ? 'unpublished' : ''}" jsf:rendered="#{result.type eq searchObjectTypeEnum.DATASETS}">
-            <c:set var="dsUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? result.datasetUrl : widgetWrapper.wrapURL(result.datasetUrl)}" />
-            <c:set var="dsCardUrlsTarget" value="#{(!lastSearchValue.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" />
-            <c:set var="dsIsLinked" value="#{!lastSearchValue.rootDv and !result.isInTree}" />
+        <div class="datasetResult clearfix #{result.unpublishedState ? 'unpublished' : ''}" 
+             jsf:rendered="#{result.type eq searchObjectTypeEnum.DATASETS}">
+            <c:set var="dsUrlFinal" 
+                   value="#{!lastSearchValue.rootDv and !result.isInTree ? result.datasetUrl : widgetWrapper.wrapURL(result.datasetUrl)}" />
+            <c:set var="dsCardUrlsTarget" 
+                   value="#{(!lastSearchValue.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" />
+            <c:set var="dsIsLinked" 
+                   value="#{!lastSearchValue.rootDv and !result.isInTree}" />
 
-            <c:set var="dsParentUrl" value="/dataverse/#{result.dataverseAlias}"/>
-            <c:set var="dsParentUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? dsParentUrl : widgetWrapper.wrapURL(dvParentAlias)}"/>
+            <c:set var="dsParentUrl" 
+                   value="/dataverse/#{result.dataverseAlias}"/>
+            <c:set var="dsParentUrlFinal" 
+                   value="#{!lastSearchValue.rootDv and !result.isInTree ? dsParentUrl : widgetWrapper.wrapURL(dvParentAlias)}"/>
 
 
             <div class="card-preview-icon-block text-center">
-                <a href="#{dsUrlFinal}" target="#{dsCardUrlsTarget}" tabindex="-1"
+                <a href="#{dsUrlFinal}" 
+                   target="#{dsCardUrlsTarget}" 
+                   tabindex="-1"
                    aria-label="#{bundle.dataset} #{result.title} #{result.draftState ? bundle['dataset.versionUI.draft'] : ''}">
-                    <h:graphicImage value="#{result.imageUrl}" rendered="#{!empty result.imageUrl}" alt="#{bundle['dataverse.results.cards.dataset.thumbnailPrefix']} #{result.title}" />
-                    <span class="icon-dataset" jsf:rendered="#{empty result.imageUrl}" role="img" aria-label="#{bundle.dataset}"/>
+                    <h:graphicImage value="#{result.imageUrl}" 
+                                    rendered="#{!empty result.imageUrl}" 
+                                    alt="#{bundle['dataverse.results.cards.dataset.thumbnailPrefix']} #{result.title}" />
+                    <span class="icon-dataset" 
+                          jsf:rendered="#{empty result.imageUrl}" 
+                          role="img" 
+                          aria-label="#{bundle.dataset}"/>
                 </a>
             </div>
 
             <div class="card-content-container">
                 <div class="card-title-icon-block">
-                    <span class="icon-dataset text-info pull-right" title="#{bundle.dataset}" role="img" aria-label="#{bundle.dataset}" />
-                    <span class="glyphicon glyphicon-new-window text-info pull-right" title="#{bundle.harvested}" jsf:rendered="#{result.harvested}" role="img" aria-label="#{bundle.harvested}" />
-                    <span class="glyphicon glyphicon-link text-info pull-right" title="#{bundle.linked}" jsf:rendered="#{dsIsLinked}" role="img" aria-label="#{bundle.linked}" />
+                    <span class="icon-dataset text-info pull-right" 
+                          title="#{bundle.dataset}" 
+                          role="img" 
+                          aria-label="#{bundle.dataset}" />
+                    <span class="glyphicon glyphicon-new-window text-info pull-right" 
+                          title="#{bundle.harvested}" 
+                          jsf:rendered="#{result.harvested}" 
+                          role="img" 
+                          aria-label="#{bundle.harvested}" />
+                    <span class="glyphicon glyphicon-link text-info pull-right" 
+                          title="#{bundle.linked}" 
+                          jsf:rendered="#{dsIsLinked}" 
+                          role="img" 
+                          aria-label="#{bundle.linked}" />
                     <div class="label-container pull-right">
-                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{result.draftState}"/>
-                        <h:outputText value="#{bundle['dataset.versionUI.embargo']}" styleClass="label label-primary" rendered="#{result.underEmbargo}"/>
-                        <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{result.inReviewState}"/>
-                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{result.unpublishedState}"/>
-                        <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{result.deaccessionedState}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" 
+                                      styleClass="label label-primary" 
+                                      rendered="#{result.draftState}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.embargo']}" 
+                                      styleClass="label label-primary" 
+                                      rendered="#{result.underEmbargo}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.inReview']}" 
+                                      styleClass="label label-success" 
+                                      rendered="#{result.inReviewState}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" 
+                                      styleClass="label label-warning" 
+                                      rendered="#{result.unpublishedState}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" 
+                                      styleClass="label label-danger" 
+                                      rendered="#{result.deaccessionedState}"/>
                     </div>
-                    <a href="#{dsUrlFinal}" target="#{dsCardUrlsTarget}">
-                        <h:outputText value="#{bundle.dataset}" styleClass="sr-only" />
-                        <h:outputText value="#{result.title}" escape="false" rendered="#{result.titleHighlightSnippet == null}"/>
-                        <h:outputText value="#{result.titleHighlightSnippet}" rendered="#{result.titleHighlightSnippet != null}" escape="false"/>
-                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="sr-only" rendered="#{result.draftState}" />
+                    <a href="#{dsUrlFinal}" 
+                       target="#{dsCardUrlsTarget}">
+                        <h:outputText value="#{bundle.dataset}" 
+                                      styleClass="sr-only" />
+                        <h:outputText value="#{result.title}" 
+                                      escape="false" 
+                                      rendered="#{result.titleHighlightSnippet == null}"/>
+                        <h:outputText value="#{result.titleHighlightSnippet}" 
+                                      rendered="#{result.titleHighlightSnippet != null}"
+                                      escape="false"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" 
+                                      styleClass="sr-only" 
+                                      rendered="#{result.draftState}" />
                     </a>
                 </div>
 
-                <h:outputText styleClass="text-muted" value="#{dv:formatDate(result.releaseOrCreateDate)}"/>
+                <h:outputText styleClass="text-muted" 
+                              value="#{dv:formatDate(result.releaseOrCreateDate)}"/>
 
-                <h:outputText styleClass="text-muted" value=" - " rendered="#{result.parent.id != lastSearchValue.dataverseId}"/>
+                <h:outputText styleClass="text-muted" 
+                              value=" - " 
+                              rendered="#{result.parent.id != lastSearchValue.dataverseId}"/>
 
-                <h:outputLink value="#{dsParentUrl}" target="#{dsCardUrlsTarget}" rendered="#{result.parent.id != lastSearchValue.dataverseId}">
-                    <h:outputText value="#{bundle.dataverse}" styleClass="sr-only" />
+                <h:outputLink value="#{dsParentUrl}" 
+                              target="#{dsCardUrlsTarget}" 
+                              rendered="#{result.parent.id != lastSearchValue.dataverseId}">
+                    <h:outputText value="#{bundle.dataverse}" 
+                                  styleClass="sr-only" />
                     <h:outputText value="#{result.parent.name}"/>
                 </h:outputLink>
 
                 <div class="resultDatasetCitationBlock #{result.deaccessionedState ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
                     <p class="text-block">
-                        <h:outputText value="#{result.citationHtml != null ? result.citationHtml : result.citation}" escape="false"/>
+                        <h:outputText value="#{result.citationHtml != null ? result.citationHtml : result.citation}" 
+                                      escape="false"/>
                     </p>
                     <ui:include src="pluggable/search-include-footer-fragment.xhtml">
-                        <ui:param name="result" value="#{result}" />
+                        <ui:param name="result" 
+                                  value="#{result}" />
                     </ui:include>
                 </div>
 
-                <h:outputText value="#{Strings:abbreviate(result.descriptionNoSnippet, descriptionAbbreviationThreshold)}" rendered="#{result.descriptionSnippets.size() eq 0}"/>
+                <h:outputText value="#{Strings:abbreviate(result.descriptionNoSnippet, descriptionAbbreviationThreshold)}" 
+                              rendered="#{result.descriptionSnippets.size() eq 0}"/>
 
-                <ui:repeat value="#{result.descriptionSnippets}" var="snippet" varStatus="varStatus"
+                <ui:repeat value="#{result.descriptionSnippets}" 
+                           var="snippet" 
+                           varStatus="varStatus"
                            rendered="#{result.descriptionSnippets.size() gt 0}">
-                    <h:outputText value="... #{snippet} ..." escape="false"/>
+                    <h:outputText value="... #{snippet} ..." 
+                                  escape="false"/>
                 </ui:repeat>
 
-                <ui:repeat value="#{result.highlightsAsList}" var="highlight" rendered="#{result.highlightsAsList.size() > 0}">
-                    <ui:repeat value="#{highlight.snippets}" var="snippet">
+                <ui:repeat value="#{result.highlightsAsList}" 
+                           var="highlight" 
+                           rendered="#{result.highlightsAsList.size() > 0}">
+                    <ui:repeat value="#{highlight.snippets}" 
+                               var="snippet">
                         <div>
-                            <h:outputText value="#{highlight.displayName}: #{snippet}" escape="false"/>
+                            <h:outputText value="#{highlight.displayName}: #{snippet}" 
+                                          escape="false"/>
                         </div>
                     </ui:repeat>
                 </ui:repeat>
 
-                <div jsf:rendered="#{result.harvested}" class="text-muted small margin-top-half">
+                <div jsf:rendered="#{result.harvested}" 
+                     class="text-muted small margin-top-half">
                     <h:outputText value="#{bundle['result.harvested.description']}"/>
                 </div>
             </div>
         </div>
         <!--FILE CARDS-->
-        <div class="fileResult clearfix #{result.unpublishedState ? 'unpublished' : ''}" jsf:rendered="#{result.type eq searchObjectTypeEnum.FILES}">
-            <c:set var="fileUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" />
-            <c:set var="fileCardUrlsTarget" value="#{(!lastSearchValue.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" />
-            <c:set var="fileIsLinked" value="#{!lastSearchValue.rootDv and !result.isInTree}" />
-
-            <c:set var="fileParentUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? result.fileDatasetUrl : widgetWrapper.wrapURL(result.fileDatasetUrl)}"/>
+        <div class="fileResult clearfix #{result.unpublishedState ? 'unpublished' : ''}" 
+             jsf:rendered="#{result.type eq searchObjectTypeEnum.FILES}">
+            <c:set var="fileUrlFinal" 
+                   value="#{!lastSearchValue.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" />
+            <c:set var="fileCardUrlsTarget" 
+                   value="#{(!lastSearchValue.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" />
+            <c:set var="fileIsLinked" 
+                   value="#{!lastSearchValue.rootDv and !result.isInTree}" />
+
+            <c:set var="fileParentUrlFinal" 
+                   value="#{!lastSearchValue.rootDv and !result.isInTree ? result.fileDatasetUrl : widgetWrapper.wrapURL(result.fileDatasetUrl)}"/>
 
             <div class="card-preview-icon-block text-center">
-                <a href="#{fileUrlFinal}" target="#{fileCardUrlsTarget}" tabindex="-1"
+                <a href="#{fileUrlFinal}" 
+                   target="#{fileCardUrlsTarget}" 
+                   tabindex="-1"
                    aria-label="#{bundle.file} #{result.name} #{result.draftState ? bundle['dataset.versionUI.draft'] : ''}" >
-                    <h:graphicImage value="#{result.imageUrl}" rendered="#{!empty result.imageUrl}" alt="#{bundle['dataverse.results.cards.file.thumbnailPrefix']} #{result.name}"/>
+                    <h:graphicImage value="#{result.imageUrl}" 
+                                    rendered="#{!empty result.imageUrl}" 
+                                    alt="#{bundle['dataverse.results.cards.file.thumbnailPrefix']} #{result.name}"/>
                     <span class="icon-#{result.entity.fileClass} text-muted h1"
-                          jsf:rendered="#{empty result.imageUrl}" role="img" aria-label="#{bundle.file}"/>
+                          jsf:rendered="#{empty result.imageUrl}" 
+                          role="img" 
+                          aria-label="#{bundle.file}"/>
                 </a>
             </div>
 
             <div class="card-content-container">
                 <div class="card-title-icon-block">
-                    <span class="icon-file text-muted pull-right" title="#{bundle.file}" role="img" aria-label="#{bundle.file}"/>
-                    <span class="glyphicon glyphicon-new-window text-muted pull-right" title="#{bundle.harvested}" jsf:rendered="#{result.harvested}" role="img" aria-label="#{bundle.harvested}"/>
-                    <span class="glyphicon glyphicon-link text-muted pull-right" title="#{bundle.linked}" jsf:rendered="#{fileIsLinked}" role="img" aria-label="#{bundle.linked}"/>
-
-                    <span class="text-danger glyphicon glyphicon-lock" title="#{bundle.restricted}" jsf:rendered="#{result.fileAccess eq 'Restricted' and !permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
-                    <span class="text-success icon-unlock" title="#{bundle.restrictedaccess}" jsf:rendered="#{result.fileAccess eq 'Restricted' and permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
+                    <span class="icon-file text-muted pull-right" 
+                          title="#{bundle.file}" 
+                          role="img" 
+                          aria-label="#{bundle.file}"/>
+                    <span class="glyphicon glyphicon-new-window text-muted pull-right" 
+                          title="#{bundle.harvested}" 
+                          jsf:rendered="#{result.harvested}" 
+                          role="img" 
+                          aria-label="#{bundle.harvested}"/>
+                    <span class="glyphicon glyphicon-link text-muted pull-right" 
+                          title="#{bundle.linked}" 
+                          jsf:rendered="#{fileIsLinked}" 
+                          role="img" 
+                          aria-label="#{bundle.linked}"/>
+
+                    <span class="text-danger glyphicon glyphicon-lock" 
+                          title="#{bundle.restricted}" 
+                          jsf:rendered="#{result.fileAccess eq 'Restricted' and !permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
+                    <span class="text-success icon-unlock" 
+                          title="#{bundle.restrictedaccess}" 
+                          jsf:rendered="#{result.fileAccess eq 'Restricted' and permissionsWrapper.hasDownloadFilePermission(result.entity)}"/>
                     <div class="label-container pull-right">
-                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{result.draftState}"/>
-                        <h:outputText value="#{bundle['dataset.versionUI.embargo']}" styleClass="label label-primary" rendered="#{result.underEmbargo}"/>
-                        <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{result.inReviewState}"/>
-                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{result.unpublishedState}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" 
+                                      styleClass="label label-primary" 
+                                      rendered="#{result.draftState}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.embargo']}" 
+                                      styleClass="label label-primary" 
+                                      rendered="#{result.underEmbargo}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.inReview']}" 
+                                      styleClass="label label-success" 
+                                      rendered="#{result.inReviewState}"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" 
+                                      styleClass="label label-warning" 
+                                      rendered="#{result.unpublishedState}"/>
                     </div>
-                    <a href="#{fileUrlFinal}" target="#{fileCardUrlsTarget}">
-                        <h:outputText value="#{bundle.file}" styleClass="sr-only" />
-                        <h:outputText value="#{result.name}" rendered="#{result.nameHighlightSnippet == null}"/>
-                        <h:outputText value="#{result.nameHighlightSnippet}" rendered="#{result.nameHighlightSnippet != null}" escape="false"/>
-                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="sr-only" rendered="#{result.draftState}" />
+                    <a href="#{fileUrlFinal}" 
+                       target="#{fileCardUrlsTarget}">
+                        <h:outputText value="#{bundle.file}" 
+                                      styleClass="sr-only" />
+                        <h:outputText value="#{result.name}" 
+                                      rendered="#{result.nameHighlightSnippet == null}"/>
+                        <h:outputText value="#{result.nameHighlightSnippet}" 
+                                      rendered="#{result.nameHighlightSnippet != null}" 
+                                      escape="false"/>
+                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" 
+                                      styleClass="sr-only" 
+                                      rendered="#{result.draftState}" />
                     </a>
                 </div>
 
                 <div>
-                    <h:outputText styleClass="text-muted" value="#{dv:formatDate(result.releaseOrCreateDate)} - "/>
-                    <a href="#{fileParentUrlFinal}" target="#{fileCardUrlsTarget}">
+                    <h:outputText styleClass="text-muted" 
+                                  value="#{dv:formatDate(result.releaseOrCreateDate)} - "/>
+                    <a href="#{fileParentUrlFinal}" 
+                       target="#{fileCardUrlsTarget}">
                         <h:outputText value="#{bundle.dataset}" styleClass="sr-only" />
                         <h:outputText value="#{result.parent.name}" escape="false"/></a>
                 </div>
 
                 <div>
-                    <h:outputText value="#{bundle['dataverse.results.cards.files.tabularData']}" styleClass="text-muted" rendered="#{!empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"/>
-                    <h:outputText value="#{result.filetype}" styleClass="text-muted" rendered="#{empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity) and result.fileTypeHighlightSnippet == null}"/>
-                    <h:outputText value="#{result.fileTypeHighlightSnippet}" styleClass="text-muted" rendered="#{empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity) and result.fileTypeHighlightSnippet != null}" escape="false"/>
-
-                    <h:outputText styleClass="text-muted" value=" - #{SearchIncludeFragment.dataFileSizeDisplay(result.entity)}" rendered="#{!result.harvested}" />
-
-                    <h:outputText styleClass="text-muted" value=" - #{SearchIncludeFragment.dataFileChecksumDisplay(result.entity)}" rendered="#{!result.harvested and !SearchIncludeFragment.isTabular(result.entity) and !(empty SearchIncludeFragment.dataFileChecksumDisplay(result.entity))}"/>
+                    <h:outputText value="#{bundle['dataverse.results.cards.files.tabularData']}" 
+                                  styleClass="text-muted" 
+                                  rendered="#{!empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"/>
+                    <h:outputText value="#{result.filetype}" 
+                                  styleClass="text-muted" 
+                                  rendered="#{empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity) and result.fileTypeHighlightSnippet == null}"/>
+                    <h:outputText value="#{result.fileTypeHighlightSnippet}" 
+                                  styleClass="text-muted" 
+                                  rendered="#{empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity) and result.fileTypeHighlightSnippet != null}" 
+                                  escape="false"/>
+
+                    <h:outputText styleClass="text-muted" 
+                                  value=" - #{SearchIncludeFragment.dataFileSizeDisplay(result.entity)}" 
+                                  rendered="#{!result.harvested}" />
+
+                    <h:outputText styleClass="text-muted" 
+                                  value=" - #{SearchIncludeFragment.dataFileChecksumDisplay(result.entity)}" 
+                                  rendered="#{!result.harvested and !SearchIncludeFragment.isTabular(result.entity) and !(empty SearchIncludeFragment.dataFileChecksumDisplay(result.entity))}"/>
 
                     <!-- if this is a tabular data file, extra information, such as the numbers of variables and observations and the unf, is displayed: -->
-                    <h:outputText styleClass="text-muted" value=" - #{SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"
+                    <h:outputText styleClass="text-muted" 
+                                  value=" - #{SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"
                                   rendered="#{!empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"/>
                 </div>
 
-                <div class="file-tags-block" jsf:rendered="#{(!empty result.fileCategories) or (!empty result.tabularDataTags)}">
-                    <ui:repeat value="#{result.fileCategories}" var="cat">
-                        <h:outputText value="#{cat}" styleClass="label label-default"/>
+                <div class="file-tags-block" 
+                     jsf:rendered="#{(!empty result.fileCategories) or (!empty result.tabularDataTags)}">
+                    <ui:repeat value="#{result.fileCategories}"
+                               var="cat">
+                        <h:outputText value="#{cat}" 
+                                      styleClass="label label-default"/>
                     </ui:repeat>
-                    <ui:repeat value="#{result.tabularDataTags}" var="tag">
-                        <h:outputText value="#{tag}" styleClass="label label-info"/>
+                    <ui:repeat value="#{result.tabularDataTags}" 
+                               var="tag">
+                        <h:outputText value="#{tag}" 
+                                      styleClass="label label-info"/>
                     </ui:repeat>
                 </div>
 
-                <h:outputText value="#{Strings:abbreviate(result.descriptionNoSnippet, descriptionAbbreviationThreshold)}" rendered="#{result.descriptionSnippets.size() eq 0}"/>
+                <h:outputText value="#{Strings:abbreviate(result.descriptionNoSnippet, descriptionAbbreviationThreshold)}" 
+                              rendered="#{result.descriptionSnippets.size() eq 0}"/>
 
-                <ui:repeat value="#{result.descriptionSnippets}" var="snippet" varStatus="varStatus"
+                <ui:repeat value="#{result.descriptionSnippets}" 
+                           var="snippet" 
+                           varStatus="varStatus"
                            rendered="#{result.descriptionSnippets.size() gt 0}">
-                    <h:outputText value="#{snippet}" escape="false"/>
-                    <h:outputText value="... " rendered="#{varStatus.last != true}"/>
+                    <h:outputText value="#{snippet}" 
+                                  escape="false"/>
+                    <h:outputText value="... " 
+                                  rendered="#{varStatus.last != true}"/>
                 </ui:repeat>
 
                 <div jsf:rendered="#{result.highlightsAsList.size() > 0}">
                     <ui:repeat value="#{result.highlightsAsList}" var="highlight">
                         <ui:repeat value="#{highlight.snippets}" var="snippet">
                             <div>
-                                <h:outputText value="#{highlight.displayName}: #{snippet}" escape="false"/>
+                                <h:outputText value="#{highlight.displayName}: #{snippet}" 
+                                              escape="false"/>
                             </div>
                         </ui:repeat>
                     </ui:repeat>
                 </div>
 
                 <div jsf:rendered="#{result.harvested}">
-                    <h:outputText value="#{bundle['result.harvested.description']}" styleClass="text-muted" style="margin-right:.5em;"/>
+                    <h:outputText value="#{bundle['result.harvested.description']}" 
+                                  styleClass="text-muted" 
+                                  style="margin-right:.5em;"/>
                 </div>
             </div>
         </div>