diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
index da960a21c..571c89b0c 100644
--- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
+++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
@@ -17,6 +17,9 @@ package org.codelibs.fess.taglib;
 
 import java.io.File;
 import java.math.RoundingMode;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -28,6 +31,8 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
@@ -40,14 +45,38 @@ import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.di.util.LdiURLUtil;
 import org.lastaflute.web.util.LaRequestUtil;
+import org.lastaflute.web.util.LaResponseUtil;
 import org.lastaflute.web.util.LaServletContextUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 
 public class FessFunctions {
+    private static final Logger logger = LoggerFactory.getLogger(FessFunctions.class);
 
     private static final String GEO_PREFIX = "geo.";
 
     private static final String FACET_PREFIX = "facet.";
 
+    private static LoadingCache<String, Long> resourceHashCache = CacheBuilder.newBuilder().maximumSize(1000)
+            .expireAfterWrite(10, TimeUnit.MINUTES).build(new CacheLoader<String, Long>() {
+                @Override
+                public Long load(String key) throws Exception {
+                    try {
+                        final Path path = Paths.get(LaServletContextUtil.getServletContext().getRealPath(key));
+                        if (Files.exists(path)) {
+                            return Files.getLastModifiedTime(path).toMillis();
+                        }
+                    } catch (Exception e) {
+                        logger.debug("Failed to access " + key, e);
+                    }
+                    return 0L;
+                }
+            });
+
     protected FessFunctions() {
         // nothing
     }
@@ -231,4 +260,29 @@ public class FessFunctions {
         return file.exists();
     }
 
+    public static String url(String input) {
+        if (input == null) {
+            String msg = "The argument 'input' should not be null.";
+            throw new IllegalArgumentException(msg);
+        }
+        if (!input.startsWith("/")) {
+            String msg = "The argument 'input' should start with slash '/': " + input;
+            throw new IllegalArgumentException(msg);
+        }
+        final String contextPath = LaRequestUtil.getRequest().getContextPath();
+        final StringBuilder sb = new StringBuilder();
+        if (contextPath.length() > 1) {
+            sb.append(contextPath);
+        }
+        sb.append(input);
+        if (input.indexOf('?') == -1) {
+            try {
+                final String t = resourceHashCache.get(input).toString();
+                sb.append("?t=").append(t);
+            } catch (ExecutionException e) {
+                logger.debug("Failed to access " + input, e);
+            }
+        }
+        return LaResponseUtil.getResponse().encodeURL(sb.toString());
+    }
 }
diff --git a/src/main/webapp/WEB-INF/fe.tld b/src/main/webapp/WEB-INF/fe.tld
index 9b2b5fe6c..01b330959 100644
--- a/src/main/webapp/WEB-INF/fe.tld
+++ b/src/main/webapp/WEB-INF/fe.tld
@@ -203,4 +203,11 @@
     </example>
   </function>
 
+	<function>
+		<description>Calculates URL.</description>
+		<name>url</name>
+		<function-class>org.codelibs.fess.taglib.FessFunctions</function-class>
+		<function-signature>java.lang.String url(java.lang.String)</function-signature>
+		<example>&lt;a href="${f:url(param:info)}" ...</example>
+	</function>
 </taglib>
diff --git a/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp b/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp
index 12c2080c5..578ccfaf2 100644
--- a/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp
@@ -7,11 +7,11 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.system_error_title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}"
+<link href="${fe:url('/css/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
 </head>
 <body class="error">
@@ -31,10 +31,10 @@
 	</div>
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
 </html>
 <% }catch(Exception e){ session.invalidate();}%>
diff --git a/src/main/webapp/WEB-INF/orig/view/error/error.jsp b/src/main/webapp/WEB-INF/orig/view/error/error.jsp
index 6fb1f40ac..51586360d 100644
--- a/src/main/webapp/WEB-INF/orig/view/error/error.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/error/error.jsp
@@ -6,11 +6,11 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.system_error_title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}"
+<link href="${fe:url('/css/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
 </head>
 <body class="error">
@@ -35,9 +35,9 @@
 	</div>
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/orig/view/error/header.jsp b/src/main/webapp/WEB-INF/orig/view/error/header.jsp
index 3893304d3..e4769467d 100755
--- a/src/main/webapp/WEB-INF/orig/view/error/header.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/error/header.jsp
@@ -4,7 +4,7 @@
 	${fe:facetForm()}${fe:geoForm()}
 	<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
 		<la:link styleClass="navbar-brand" href="/">
-			<img src="${f:url('/images/logo-head.png')}"
+			<img src="${fe:url('/images/logo-head.png')}"
 				 alt="<la:message key="labels.header_brand_name" />" />
 		</la:link>
 		<div
diff --git a/src/main/webapp/WEB-INF/orig/view/error/notFound.jsp b/src/main/webapp/WEB-INF/orig/view/error/notFound.jsp
index 8a18286b4..7be347b80 100644
--- a/src/main/webapp/WEB-INF/orig/view/error/notFound.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/error/notFound.jsp
@@ -6,11 +6,11 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.system_error_title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}"
+<link href="${fe:url('/css/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
 </head>
 <body class="error">
@@ -33,9 +33,9 @@
 	</div>
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/orig/view/error/system.jsp b/src/main/webapp/WEB-INF/orig/view/error/system.jsp
index 84628c650..639f8539c 100644
--- a/src/main/webapp/WEB-INF/orig/view/error/system.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/error/system.jsp
@@ -7,11 +7,11 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.system_error_title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}"
+<link href="${fe:url('/css/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
 </head>
 <body class="error">
@@ -31,10 +31,10 @@
 	</div>
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
 </html>
 <% }catch(Exception e){ session.invalidate();}%>
diff --git a/src/main/webapp/WEB-INF/orig/view/header.jsp b/src/main/webapp/WEB-INF/orig/view/header.jsp
index a24f25de0..12ef3cf4d 100755
--- a/src/main/webapp/WEB-INF/orig/view/header.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/header.jsp
@@ -4,7 +4,7 @@
 ${fe:facetForm()}${fe:geoForm()}
 <nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
 		<la:link styleClass="navbar-brand" href="/">
-			<img src="${f:url('/images/logo-head.png')}"
+			<img src="${fe:url('/images/logo-head.png')}"
 				alt="<la:message key="labels.header_brand_name" />" />
 		</la:link>
 		<div
diff --git a/src/main/webapp/WEB-INF/orig/view/help.jsp b/src/main/webapp/WEB-INF/orig/view/help.jsp
index fe3af7fa1..874340ac6 100644
--- a/src/main/webapp/WEB-INF/orig/view/help.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/help.jsp
@@ -6,10 +6,10 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.search_title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
 </head>
 <body class="help">
@@ -29,9 +29,9 @@
 	</div>
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/help.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/help.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/orig/view/index.jsp b/src/main/webapp/WEB-INF/orig/view/index.jsp
index 282c74f15..2cb3ea29f 100644
--- a/src/main/webapp/WEB-INF/orig/view/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/index.jsp
@@ -8,13 +8,13 @@
 <title><la:message key="labels.search_title" /></title>
 <c:if test="${osddLink}">
 	<link rel="search" type="application/opensearchdescription+xml"
-		href="${f:url('/osdd')}"
+		href="${fe:url('/osdd')}"
 		title="<la:message key="labels.index_osdd_title" />" />
 </c:if>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/font-awesome.min.css')}" rel="stylesheet"
 	type="text/css" />
 </head>
 <body>
@@ -71,7 +71,7 @@
 			<div class="row content">
 				<div class="center-block searchFormBox">
 					<h1 class="mainLogo">
-						<img src="${f:url('/images/logo.png')}"
+						<img src="${fe:url('/images/logo.png')}"
 							alt="<la:message key="labels.index_title" />" />
 					</h1>
 					<div class="notification">${notification}</div>
@@ -145,9 +145,9 @@
 	</la:form>
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/index.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/orig/view/login/index.jsp b/src/main/webapp/WEB-INF/orig/view/login/index.jsp
index 423504c28..aebbab8aa 100644
--- a/src/main/webapp/WEB-INF/orig/view/login/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/login/index.jsp
@@ -6,27 +6,27 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.login.title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/admin/font-awesome.min.css')}"
+<link href="${fe:url('/css/admin/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
+<link href="${fe:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/admin/skins/skin-blue.min.css')}"
+<link href="${fe:url('/css/admin/skins/skin-blue.min.css')}"
 	rel="stylesheet" type="text/css" />
 <!--[if lt IE 9]>
-<script src="${f:url('/css/admin/html5shiv.min.js')}"></script>
-<script src="${f:url('/css/admin/respond.min.js')}"></script>
+<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
+<script src="${fe:url('/css/admin/respond.min.js')}"></script>
 <![endif]-->
 </head>
 <body class="hold-transition login-page">
 	<div class="login-box">
 		<div class="login-logo">
 			<la:link href="/">
-				<img src="${f:url('/images/logo-top.png')}"
+				<img src="${fe:url('/images/logo-top.png')}"
 					alt="<la:message key="labels.header_brand_name" />" />
 			</la:link>
 		</div>
@@ -95,8 +95,8 @@
 
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/admin/admin.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/admin/admin.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/orig/view/profile/index.jsp b/src/main/webapp/WEB-INF/orig/view/profile/index.jsp
index 3a24ea015..de185ebab 100644
--- a/src/main/webapp/WEB-INF/orig/view/profile/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/profile/index.jsp
@@ -6,27 +6,27 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.profile.title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/admin/font-awesome.min.css')}"
+<link href="${fe:url('/css/admin/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
+<link href="${fe:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/admin/skins/skin-blue.min.css')}"
+<link href="${fe:url('/css/admin/skins/skin-blue.min.css')}"
 	rel="stylesheet" type="text/css" />
 <!--[if lt IE 9]>
-<script src="${f:url('/css/admin/html5shiv.min.js')}"></script>
-<script src="${f:url('/css/admin/respond.min.js')}"></script>
+<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
+<script src="${fe:url('/css/admin/respond.min.js')}"></script>
 <![endif]-->
 </head>
 <body class="hold-transition login-page">
 	<div class="login-box">
 		<div class="login-logo">
 			<la:link href="/">
-				<img src="${f:url('/images/logo-top.png')}"
+				<img src="${fe:url('/images/logo-top.png')}"
 					alt="<la:message key="labels.header_brand_name" />" />
 			</la:link>
 		</div>
@@ -109,8 +109,8 @@
 
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/admin/admin.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/admin/admin.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/orig/view/search.jsp b/src/main/webapp/WEB-INF/orig/view/search.jsp
index ecfd7c8c9..5506a3706 100644
--- a/src/main/webapp/WEB-INF/orig/view/search.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/search.jsp
@@ -9,13 +9,13 @@
 		key="labels.search_title" /></title>
 <c:if test="${osddLink}">
 	<link rel="search" type="application/opensearchdescription+xml"
-		href="${f:url('/osdd')}"
+		href="${fe:url('/osdd')}"
 		title="<la:message key="labels.index_osdd_title" />" />
 </c:if>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/font-awesome.min.css')}" rel="stylesheet"
 	type="text/css" />
 </head>
 <body class="search">
@@ -127,9 +127,9 @@
 	</div>
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
index 6bf037ee9..cb26045be 100644
--- a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
@@ -33,8 +33,8 @@
 								<a class="link" href="${doc.url_link}"
 									data-uri="${doc.url_link}" data-id="${doc.doc_id}"
 									data-order="${s.index}"> <img
-									src="${f:url('/images/blank.png')}"
-									data-src="${f:url('/thumbnail/')}?docId=${f:u(doc.doc_id)}&queryId=${f:u(queryId)}"
+									src="${fe:url('/images/blank.png')}"
+									data-src="${fe:url('/thumbnail/')}?docId=${f:u(doc.doc_id)}&queryId=${f:u(queryId)}"
 									class="thumbnail">
 								</a>
 							</div>
diff --git a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp
index d75e12785..87c6bc6ec 100644
--- a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp
@@ -76,7 +76,7 @@
 												<th><la:message
 														key="labels.crawling_info_session_id" /></th>
 												<td><a
-													href="${f:url('/admin/searchlist/search')}?q=segment:${f:u(sessionId)}">${f:h(sessionId)}</a>
+													href="${fe:url('/admin/searchlist/search')}?q=segment:${f:u(sessionId)}">${f:h(sessionId)}</a>
 													<la:hidden property="sessionId" /></td>
 											</tr>
 											<c:forEach var="info" items="${crawlingInfoParamItems}">
diff --git a/src/main/webapp/WEB-INF/view/admin/dashboard/admin_dashboard.jsp b/src/main/webapp/WEB-INF/view/admin/dashboard/admin_dashboard.jsp
index 8064c7ea8..73ef7a48b 100644
--- a/src/main/webapp/WEB-INF/view/admin/dashboard/admin_dashboard.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dashboard/admin_dashboard.jsp
@@ -20,6 +20,6 @@
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-	<script src="${f:url('/js/admin/dashboard.js')}" type="text/javascript"></script>
+	<script src="${fe:url('/js/admin/dashboard.js')}" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
index 1b430a893..0f10c95b5 100644
--- a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
@@ -378,7 +378,7 @@
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-	<script src="${f:url('/js/admin/form-validator/jquery.form-validator.min.js')}" type="text/javascript"></script>
-	<script src="${f:url('/js/admin/load-validator.js')}" type="text/javascript"></script>
+	<script src="${fe:url('/js/admin/form-validator/jquery.form-validator.min.js')}" type="text/javascript"></script>
+	<script src="${fe:url('/js/admin/load-validator.js')}" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/common/admin/foot.jsp b/src/main/webapp/WEB-INF/view/common/admin/foot.jsp
index 33c93e118..f250529eb 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/foot.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/foot.jsp
@@ -1,8 +1,8 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
-<script src="${f:url('/js/admin/jquery-2.2.4.min.js')}" type="text/javascript"></script>
-<script src="${f:url('/js/admin/bootstrap.min.js')}" type="text/javascript"></script>
-<script src="${f:url('/js/admin/moment-with-locales.min.js')}" type="text/javascript"></script>
-<script src="${f:url('/js/admin/plugins/daterangepicker/daterangepicker.js')}" type="text/javascript"></script>
-<script src="${f:url('/js/admin/plugins/timepicker/bootstrap-timepicker.min.js')}" type="text/javascript"></script>
-<script src="${f:url('/js/admin/app.min.js')}" type="text/javascript"></script>
-<script src="${f:url('/js/admin/admin.js')}" type="text/javascript"></script>
+<script src="${fe:url('/js/admin/jquery-2.2.4.min.js')}" type="text/javascript"></script>
+<script src="${fe:url('/js/admin/bootstrap.min.js')}" type="text/javascript"></script>
+<script src="${fe:url('/js/admin/moment-with-locales.min.js')}" type="text/javascript"></script>
+<script src="${fe:url('/js/admin/plugins/daterangepicker/daterangepicker.js')}" type="text/javascript"></script>
+<script src="${fe:url('/js/admin/plugins/timepicker/bootstrap-timepicker.min.js')}" type="text/javascript"></script>
+<script src="${fe:url('/js/admin/app.min.js')}" type="text/javascript"></script>
+<script src="${fe:url('/js/admin/admin.js')}" type="text/javascript"></script>
diff --git a/src/main/webapp/WEB-INF/view/common/admin/head.jsp b/src/main/webapp/WEB-INF/view/common/admin/head.jsp
index c3c319c75..a3533064c 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/head.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/head.jsp
@@ -1,15 +1,15 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
 <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<link href="${f:url('/css/admin/bootstrap.min.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/font-awesome.min.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/skins/skin-blue.min.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/plugins/daterangepicker/daterangepicker.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/plugins/timepicker/bootstrap-timepicker.min.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/bootstrap.min.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/font-awesome.min.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/skins/skin-blue.min.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/plugins/daterangepicker/daterangepicker.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/plugins/timepicker/bootstrap-timepicker.min.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet" type="text/css" />
 <!--[if lt IE 9]>
-<script src="${f:url('/css/admin/html5shiv.min.js')}"></script>
-<script src="${f:url('/css/admin/respond.min.js')}"></script>
+<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
+<script src="${fe:url('/css/admin/respond.min.js')}"></script>
 <![endif]-->
 
diff --git a/src/main/webapp/WEB-INF/view/common/admin/header.jsp b/src/main/webapp/WEB-INF/view/common/admin/header.jsp
index 7d0572383..1674bb91c 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/header.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/header.jsp
@@ -7,7 +7,7 @@
 			src="${f:url('/images/logo-head.png')}"
 			alt="<la:message key="labels.header_brand_name" />" /></span>
 		<span class="logo-lg"><img
-			src="${f:url('/images/logo-head.png')}"
+			src="${fe:url('/images/logo-head.png')}"
 			alt="<la:message key="labels.header_brand_name" />" /></span>
 	</la:link>
 	<!-- Header Navbar -->
diff --git a/src/main/webapp/WEB-INF/view/error/badRequest.jsp b/src/main/webapp/WEB-INF/view/error/badRequest.jsp
index 12c2080c5..578ccfaf2 100644
--- a/src/main/webapp/WEB-INF/view/error/badRequest.jsp
+++ b/src/main/webapp/WEB-INF/view/error/badRequest.jsp
@@ -7,11 +7,11 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.system_error_title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}"
+<link href="${fe:url('/css/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
 </head>
 <body class="error">
@@ -31,10 +31,10 @@
 	</div>
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
 </html>
 <% }catch(Exception e){ session.invalidate();}%>
diff --git a/src/main/webapp/WEB-INF/view/error/error.jsp b/src/main/webapp/WEB-INF/view/error/error.jsp
index 6fb1f40ac..51586360d 100644
--- a/src/main/webapp/WEB-INF/view/error/error.jsp
+++ b/src/main/webapp/WEB-INF/view/error/error.jsp
@@ -6,11 +6,11 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.system_error_title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}"
+<link href="${fe:url('/css/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
 </head>
 <body class="error">
@@ -35,9 +35,9 @@
 	</div>
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/error/header.jsp b/src/main/webapp/WEB-INF/view/error/header.jsp
index 3893304d3..e4769467d 100755
--- a/src/main/webapp/WEB-INF/view/error/header.jsp
+++ b/src/main/webapp/WEB-INF/view/error/header.jsp
@@ -4,7 +4,7 @@
 	${fe:facetForm()}${fe:geoForm()}
 	<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
 		<la:link styleClass="navbar-brand" href="/">
-			<img src="${f:url('/images/logo-head.png')}"
+			<img src="${fe:url('/images/logo-head.png')}"
 				 alt="<la:message key="labels.header_brand_name" />" />
 		</la:link>
 		<div
diff --git a/src/main/webapp/WEB-INF/view/error/notFound.jsp b/src/main/webapp/WEB-INF/view/error/notFound.jsp
index 8a18286b4..7be347b80 100644
--- a/src/main/webapp/WEB-INF/view/error/notFound.jsp
+++ b/src/main/webapp/WEB-INF/view/error/notFound.jsp
@@ -6,11 +6,11 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.system_error_title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}"
+<link href="${fe:url('/css/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
 </head>
 <body class="error">
@@ -33,9 +33,9 @@
 	</div>
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/error/system.jsp b/src/main/webapp/WEB-INF/view/error/system.jsp
index 84628c650..639f8539c 100644
--- a/src/main/webapp/WEB-INF/view/error/system.jsp
+++ b/src/main/webapp/WEB-INF/view/error/system.jsp
@@ -7,11 +7,11 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.system_error_title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}"
+<link href="${fe:url('/css/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
 </head>
 <body class="error">
@@ -31,10 +31,10 @@
 	</div>
 	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
 </html>
 <% }catch(Exception e){ session.invalidate();}%>
diff --git a/src/main/webapp/WEB-INF/view/header.jsp b/src/main/webapp/WEB-INF/view/header.jsp
index a24f25de0..12ef3cf4d 100755
--- a/src/main/webapp/WEB-INF/view/header.jsp
+++ b/src/main/webapp/WEB-INF/view/header.jsp
@@ -4,7 +4,7 @@
 ${fe:facetForm()}${fe:geoForm()}
 <nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
 		<la:link styleClass="navbar-brand" href="/">
-			<img src="${f:url('/images/logo-head.png')}"
+			<img src="${fe:url('/images/logo-head.png')}"
 				alt="<la:message key="labels.header_brand_name" />" />
 		</la:link>
 		<div
diff --git a/src/main/webapp/WEB-INF/view/help.jsp b/src/main/webapp/WEB-INF/view/help.jsp
index fe3af7fa1..874340ac6 100644
--- a/src/main/webapp/WEB-INF/view/help.jsp
+++ b/src/main/webapp/WEB-INF/view/help.jsp
@@ -6,10 +6,10 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.search_title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
 </head>
 <body class="help">
@@ -29,9 +29,9 @@
 	</div>
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/help.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/help.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
index 282c74f15..2cb3ea29f 100644
--- a/src/main/webapp/WEB-INF/view/index.jsp
+++ b/src/main/webapp/WEB-INF/view/index.jsp
@@ -8,13 +8,13 @@
 <title><la:message key="labels.search_title" /></title>
 <c:if test="${osddLink}">
 	<link rel="search" type="application/opensearchdescription+xml"
-		href="${f:url('/osdd')}"
+		href="${fe:url('/osdd')}"
 		title="<la:message key="labels.index_osdd_title" />" />
 </c:if>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/font-awesome.min.css')}" rel="stylesheet"
 	type="text/css" />
 </head>
 <body>
@@ -71,7 +71,7 @@
 			<div class="row content">
 				<div class="center-block searchFormBox">
 					<h1 class="mainLogo">
-						<img src="${f:url('/images/logo.png')}"
+						<img src="${fe:url('/images/logo.png')}"
 							alt="<la:message key="labels.index_title" />" />
 					</h1>
 					<div class="notification">${notification}</div>
@@ -145,9 +145,9 @@
 	</la:form>
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/index.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/login/index.jsp b/src/main/webapp/WEB-INF/view/login/index.jsp
index 423504c28..aebbab8aa 100644
--- a/src/main/webapp/WEB-INF/view/login/index.jsp
+++ b/src/main/webapp/WEB-INF/view/login/index.jsp
@@ -6,27 +6,27 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.login.title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/admin/font-awesome.min.css')}"
+<link href="${fe:url('/css/admin/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
+<link href="${fe:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/admin/skins/skin-blue.min.css')}"
+<link href="${fe:url('/css/admin/skins/skin-blue.min.css')}"
 	rel="stylesheet" type="text/css" />
 <!--[if lt IE 9]>
-<script src="${f:url('/css/admin/html5shiv.min.js')}"></script>
-<script src="${f:url('/css/admin/respond.min.js')}"></script>
+<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
+<script src="${fe:url('/css/admin/respond.min.js')}"></script>
 <![endif]-->
 </head>
 <body class="hold-transition login-page">
 	<div class="login-box">
 		<div class="login-logo">
 			<la:link href="/">
-				<img src="${f:url('/images/logo-top.png')}"
+				<img src="${fe:url('/images/logo-top.png')}"
 					alt="<la:message key="labels.header_brand_name" />" />
 			</la:link>
 		</div>
@@ -95,8 +95,8 @@
 
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/admin/admin.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/admin/admin.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/profile/index.jsp b/src/main/webapp/WEB-INF/view/profile/index.jsp
index 3a24ea015..de185ebab 100644
--- a/src/main/webapp/WEB-INF/view/profile/index.jsp
+++ b/src/main/webapp/WEB-INF/view/profile/index.jsp
@@ -6,27 +6,27 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.profile.title" /></title>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/style.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/admin/font-awesome.min.css')}"
+<link href="${fe:url('/css/admin/font-awesome.min.css')}"
 	rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
+<link href="${fe:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/admin/skins/skin-blue.min.css')}"
+<link href="${fe:url('/css/admin/skins/skin-blue.min.css')}"
 	rel="stylesheet" type="text/css" />
 <!--[if lt IE 9]>
-<script src="${f:url('/css/admin/html5shiv.min.js')}"></script>
-<script src="${f:url('/css/admin/respond.min.js')}"></script>
+<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
+<script src="${fe:url('/css/admin/respond.min.js')}"></script>
 <![endif]-->
 </head>
 <body class="hold-transition login-page">
 	<div class="login-box">
 		<div class="login-logo">
 			<la:link href="/">
-				<img src="${f:url('/images/logo-top.png')}"
+				<img src="${fe:url('/images/logo-top.png')}"
 					alt="<la:message key="labels.header_brand_name" />" />
 			</la:link>
 		</div>
@@ -109,8 +109,8 @@
 
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/admin/admin.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/admin/admin.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/search.jsp b/src/main/webapp/WEB-INF/view/search.jsp
index ecfd7c8c9..5506a3706 100644
--- a/src/main/webapp/WEB-INF/view/search.jsp
+++ b/src/main/webapp/WEB-INF/view/search.jsp
@@ -9,13 +9,13 @@
 		key="labels.search_title" /></title>
 <c:if test="${osddLink}">
 	<link rel="search" type="application/opensearchdescription+xml"
-		href="${f:url('/osdd')}"
+		href="${fe:url('/osdd')}"
 		title="<la:message key="labels.index_osdd_title" />" />
 </c:if>
-<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
-<link href="${f:url('/css/style.css')}" rel="stylesheet" type="text/css" />
-<link href="${f:url('/css/font-awesome.min.css')}" rel="stylesheet"
+<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/font-awesome.min.css')}" rel="stylesheet"
 	type="text/css" />
 </head>
 <body class="search">
@@ -127,9 +127,9 @@
 	</div>
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
-		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
+		src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/searchResults.jsp b/src/main/webapp/WEB-INF/view/searchResults.jsp
index 6bf037ee9..cb26045be 100644
--- a/src/main/webapp/WEB-INF/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/view/searchResults.jsp
@@ -33,8 +33,8 @@
 								<a class="link" href="${doc.url_link}"
 									data-uri="${doc.url_link}" data-id="${doc.doc_id}"
 									data-order="${s.index}"> <img
-									src="${f:url('/images/blank.png')}"
-									data-src="${f:url('/thumbnail/')}?docId=${f:u(doc.doc_id)}&queryId=${f:u(queryId)}"
+									src="${fe:url('/images/blank.png')}"
+									data-src="${fe:url('/thumbnail/')}?docId=${f:u(doc.doc_id)}&queryId=${f:u(queryId)}"
 									class="thumbnail">
 								</a>
 							</div>