diff --git a/webapp/src/main/webapp/themes/iph/templates/page.ftl b/webapp/src/main/webapp/themes/iph/templates/page.ftl
index 224f8745..69eb70e8 100644
--- a/webapp/src/main/webapp/themes/iph/templates/page.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/page.ftl
@@ -17,7 +17,7 @@
<#include "rightPanel.ftl">
#if>
<#include "contentWrapper.ftl">
- <#if currentServlet != "individual" && currentServlet != "login" && currentServlet != "display" && currentServlet != "customsearch" && currentServlet != "entity">
+ <#if currentServlet != "individual" && currentServlet != "login" && currentServlet != "display" && currentServlet != "extendedsearch" && currentServlet != "entity">
filteredSearch
@@ -25,7 +25,7 @@
${i18n().search_form}
- <#include "searchSelector.ftl">
+ <#include "simpleSearchForm.ftl">
#if>
diff --git a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
deleted file mode 100644
index 81062b49..00000000
--- a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
+++ /dev/null
@@ -1,288 +0,0 @@
-
-
-
-
${i18n().extended_search_label}
-
-
-
-
- ${i18n().open_standard_search_form}
-
-
-
-
-
-<#macro freeField field >
- {
- id: '${field.field}',
- label: '${field.name}',
- type: 'string',
- operators: ['contains', 'not_contains']
- },
-#macro>
-
-<#macro multivalueField field >
- {
- id: '${field.field}',
- label: '${field.name}',
- type: 'string',
- input: 'select',
- values: {
-
- <#if searchFields??>
- <#list searchFilters as filter>
- <#if filter.field == field.field>
- '"${filter.id}"':'${filter.name}',
- #if>
- #list>
- <#else>
- {
- id: 'ALLTEXT',
- label: 'Everywhere',
- type: 'string',
- operators: ['contains', 'not_contains']
- },
- #if>
- },
- operators: ['contains', 'not_contains']
- },
-#macro>
-
-<#macro selectHitsPerPage>
- <#if !hitsPerPage?? >
- <#assign hitsPerPage = 20 >
- #if>
- <#assign hitsValues= [20,40,60,80,100]>
-
- ${hitsPerPage}
- <#list hitsValues as hppValue>
- <#if hppValue != hitsPerPage>
- ${hppValue}
- #if>
- #list>
-
-
-#macro>
diff --git a/webapp/src/main/webapp/themes/iph/templates/searchSelector.ftl b/webapp/src/main/webapp/themes/iph/templates/searchSelector.ftl
deleted file mode 100644
index 7c950df7..00000000
--- a/webapp/src/main/webapp/themes/iph/templates/searchSelector.ftl
+++ /dev/null
@@ -1,18 +0,0 @@
-
- <#include "customSearchForm.ftl">
- ${i18n().extended_search_label}
-
-<#include "queryBuilder.ftl">
-
-
-
diff --git a/webapp/src/main/webapp/themes/iph/templates/simpleSearchForm.ftl b/webapp/src/main/webapp/themes/iph/templates/simpleSearchForm.ftl
new file mode 100644
index 00000000..25707f84
--- /dev/null
+++ b/webapp/src/main/webapp/themes/iph/templates/simpleSearchForm.ftl
@@ -0,0 +1,9 @@
+
+ <#include "customSearchForm.ftl">
+
+
+
+
+