diff --git a/application-home/conf/datasources/ds-sites.xml b/application-home/conf/datasources/ds-sites.xml
index 8145efd..070523e 100644
--- a/application-home/conf/datasources/ds-sites.xml
+++ b/application-home/conf/datasources/ds-sites.xml
@@ -100,7 +100,7 @@
 						<permission ref="site.reload" mode="set" />
 					</permissions>
 				</link>
-				<link mode="intern" target="/sites&#63;act=reloadTemplate&#38;siteid=${current.id}">
+				<link mode="intern" target="/sites&#63;act=reloadTemplate&#38;sitename=${current.name}">
 					<label>reload.template</label>
 					<icon>reload</icon>
 					<condition expression="${current.state.name() eq 'STARTED'}" />
diff --git a/application-home/conf/events/ev-sites.xml b/application-home/conf/events/ev-sites.xml
index 36d069b..e2660bf 100644
--- a/application-home/conf/events/ev-sites.xml
+++ b/application-home/conf/events/ev-sites.xml
@@ -87,12 +87,12 @@
 			</permissions>
 			<params>
 				<param name="form_action" />
-				<param name="siteid" />
+				<param name="sitename" />
 			</params>
 		</config>
 		<condition expression="${form_action eq 'reloadTemplate'}" />
 		<bean id="sites">
-			<option name="site" id="${siteid}" />
+			<option name="site" sitename="${sitename}" />
 			<option name="action" id="reloadTemplate" />
 		</bean>
 	</action>
diff --git a/application-home/conf/pages/pg-sites.xml b/application-home/conf/pages/pg-sites.xml
index 514e665..593e86b 100644
--- a/application-home/conf/pages/pg-sites.xml
+++ b/application-home/conf/pages/pg-sites.xml
@@ -380,7 +380,7 @@
 					<action id="reloadTemplate" eventId="siteEvent" onSuccess="/sites" forceForward="true">
 						<params>
 							<param name="form_action">${act}</param>
-							<param name="siteid">${siteid}</param>
+							<param name="sitename">${sitename}</param>
 						</params>
 					</action>
 				</element>
diff --git a/src/main/java/org/appng/application/manager/business/Sites.java b/src/main/java/org/appng/application/manager/business/Sites.java
index 4ad9406..cebfb49 100644
--- a/src/main/java/org/appng/application/manager/business/Sites.java
+++ b/src/main/java/org/appng/application/manager/business/Sites.java
@@ -24,11 +24,8 @@
 import org.appng.api.FieldProcessor;
 import org.appng.api.InvalidConfigurationException;
 import org.appng.api.Options;
-import org.appng.api.Platform;
 import org.appng.api.Request;
-import org.appng.api.Scope;
 import org.appng.api.model.Application;
-import org.appng.api.model.Properties;
 import org.appng.api.model.Site;
 import org.appng.application.manager.MessageConstants;
 import org.appng.application.manager.form.SiteForm;
@@ -85,9 +82,7 @@ public void perform(Site site, Application application, Environment environment,
 				service.reloadSite(request, application, siteId, fp);
 				okMessage = MessageConstants.SITE_RELOADED;
 			} else if (ACTION_RELOAD_TEMPLATE.equals(action)) {
-				Properties platformProps = environment.getAttribute(Scope.PLATFORM,
-						Platform.Environment.PLATFORM_CONFIG);
-				service.reloadTemplate(siteId, platformProps);
+				service.reloadTemplate(environment, options.getString(SITE, "sitename"));
 				okMessage = MessageConstants.SITE_TEMPLATE_RELOADED;
 			} else if (ACTION_RELOAD_PLATFORM.equals(action)) {
 				errorMessage = MessageConstants.PLATFORM_RELOAD_ERROR;
diff --git a/src/main/java/org/appng/application/manager/service/ManagerService.java b/src/main/java/org/appng/application/manager/service/ManagerService.java
index 85b44a5..e44e522 100644
--- a/src/main/java/org/appng/application/manager/service/ManagerService.java
+++ b/src/main/java/org/appng/application/manager/service/ManagerService.java
@@ -63,7 +63,6 @@
 import org.appng.api.model.NameProvider;
 import org.appng.api.model.Nameable;
 import org.appng.api.model.Permission;
-import org.appng.api.model.Properties;
 import org.appng.api.model.Property;
 import org.appng.api.model.Resource;
 import org.appng.api.model.ResourceType;
@@ -113,8 +112,8 @@
 import org.appng.core.model.RepositoryUtils;
 import org.appng.core.service.CoreService;
 import org.appng.core.service.InitializerService;
-import org.appng.core.service.PlatformProperties;
 import org.appng.core.service.MigrationService.MigrationStatus;
+import org.appng.core.service.PlatformProperties;
 import org.appng.core.service.PropertySupport;
 import org.appng.core.xml.repository.PackageVersions;
 import org.appng.core.xml.repository.Packages;
@@ -1613,8 +1612,7 @@ public String startSite(Request request, Application application, Integer siteId
 			throws BusinessException {
 		SiteImpl site = getSite(siteId);
 		Environment env = request.getEnvironment();
-		Map<String, Site> siteMap = env.getAttribute(Scope.PLATFORM, Platform.Environment.SITES);
-		Site activeSite = siteMap.get(site.getName());
+		Site activeSite = RequestUtil.getSiteByName(env, site.getName());
 		if (null == activeSite || SiteState.STOPPED.equals(activeSite.getState())) {
 			if (site.isActive()) {
 				try {
@@ -1638,8 +1636,7 @@ public String stopSite(Request request, Application application, Integer siteId,
 			throws BusinessException {
 		SiteImpl site = getSite(siteId);
 		Environment env = request.getEnvironment();
-		Map<String, Site> siteMap = env.getAttribute(Scope.PLATFORM, Platform.Environment.SITES);
-		Site activeSite = siteMap.get(site.getName());
+		Site activeSite = RequestUtil.getSiteByName(env, site.getName());
 		if (null != activeSite) {
 			if (SiteState.STARTED.equals(activeSite.getState())) {
 				getInitializerService(application).shutDownSite(env, site, false);
@@ -1847,10 +1844,8 @@ public void resetConnection(Integer conId) {
 	}
 
 	@Override
-	public void reloadTemplate(Integer siteId, Properties platformConfig) {
-		SiteImpl site = siteRepository.findOne(siteId);
-		initSiteProperties(site);
-		refreshTemplate(site, PlatformProperties.get(platformConfig));
+	public void reloadTemplate(Environment env, String siteName) {
+		refreshTemplate(RequestUtil.getSiteByName(env, siteName), PlatformProperties.get(env));
 	}
 
 	public SiteApplication getSiteApplication(Integer siteId, Integer appId) {
diff --git a/src/main/java/org/appng/application/manager/service/Service.java b/src/main/java/org/appng/application/manager/service/Service.java
index d951830..b6ba2cc 100644
--- a/src/main/java/org/appng/application/manager/service/Service.java
+++ b/src/main/java/org/appng/application/manager/service/Service.java
@@ -30,7 +30,6 @@
 import org.appng.api.model.Application;
 import org.appng.api.model.Identifier;
 import org.appng.api.model.Permission;
-import org.appng.api.model.Properties;
 import org.appng.api.model.ResourceType;
 import org.appng.api.model.Site;
 import org.appng.api.model.Subject;
@@ -251,6 +250,6 @@ String addArchiveToRepository(Request request, Integer repositoryId, FormUpload
 
 	void createEvent(Type type, String message);
 
-	void reloadTemplate(Integer siteId, Properties platformProps);
+	void reloadTemplate(Environment env, String siteName);
 
 }
diff --git a/src/test/resources/xml/SitesTest-testShowSites.xml b/src/test/resources/xml/SitesTest-testShowSites.xml
index ce6cb7b..c0c71c2 100644
--- a/src/test/resources/xml/SitesTest-testShowSites.xml
+++ b/src/test/resources/xml/SitesTest-testShowSites.xml
@@ -1,218 +1,218 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <datasource xmlns="http://www.appng.org/schema/platform" id="sites">
-	<config>
-		<title id="sites">Sites</title>
-		<permissions>
-			<permission ref="site.list" mode="set"></permission>
-		</permissions>
-		<params>
-			<param name="name" />
-			<param name="domain" />
-			<param name="active" />
-		</params>
-		<meta-data bindClass="org.appng.api.model.Site">
-			<field name="name" type="text" binding="name">
-				<sort />
-				<label id="name">Name</label>
-			</field>
-			<field name="host" type="text" binding="host">
-				<sort />
-				<label id="host">Host</label>
-			</field>
-			<field name="domain" type="text" binding="domain">
-				<sort />
-				<label id="domain">Domain</label>
-			</field>
-			<field name="description" type="text" binding="description">
-				<label id="description">Description</label>
-			</field>
-			<field name="active" type="image" binding="active">
-				<sort />
-				<label id="active">Active</label>
-				<icon condition="${current.active}">led_green</icon>
-				<icon condition="${!current.active}">led_red</icon>
-			</field>
-			<field name="running" type="image" binding="running">
-				<label id="running">Running</label>
-				<icon condition="${current.running}">led_green</icon>
-				<icon condition="${!current.running}">led_red</icon>
-			</field>
-			<field name="startupTime" type="date" format="yyyy-MM-dd HH:mm:ss" binding="startupTime">
-				<label id="startupTime">Startup time</label>
-			</field>
-			<field name="actions" type="linkpanel" binding="actions">
-				<label id="actions">Actions</label>
-			</field>
-		</meta-data>
-		<linkpanel id="other" location="both">
-			<link id="other[1]" mode="intern" target="/sites/create">
-				<permissions>
-					<permission ref="site.create" mode="set"></permission>
-				</permissions>
-				<label id="site.create">Create site</label>
-				<icon>new</icon>
-			</link>
-		</linkpanel>
-		<linkpanel id="actions" location="inline">
-			<link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=${current.id}">
-				<condition expression="${current.active and current.state.name() eq 'STOPPED'}" />
-				<permissions>
-					<permission ref="site.reload" mode="set"></permission>
-				</permissions>
-				<label id="site.start">Start</label>
-				<icon>activate</icon>
-			</link>
-			<link id="actions[2]" mode="intern" target="/sites?act=stop&amp;siteid=${current.id}">
-				<condition expression="${current.state.name() eq 'STARTED'}" />
-				<permissions>
-					<permission ref="site.reload" mode="set"></permission>
-				</permissions>
-				<label id="site.stop">Stop</label>
-				<icon>deactivate</icon>
-				<confirmation id="site.stop.confirm" params="#{name}">Stop site #{name}?</confirmation>
-			</link>
-			<link id="actions[3]" mode="intern" target="/sites/update/${current.id}" default="true">
-				<permissions>
-					<permission ref="site.edit" mode="set"></permission>
-				</permissions>
-				<label id="edit">Edit</label>
-				<icon>edit</icon>
-			</link>
-			<link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=${current.id}">
-				<condition expression="${current.state.name() eq 'STOPPED'}" />
-				<permissions>
-					<permission ref="site.delete" mode="set"></permission>
-				</permissions>
-				<label id="delete">Delete</label>
-				<icon>delete</icon>
-				<confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "#{name}"?</confirmation>
-			</link>
-			<link id="actions[5]" mode="intern" target="/sites?act=reload&amp;siteid=${current.id}" show-disabled="true">
-				<condition expression="${current.state.name() eq 'STARTED'}" />
-				<permissions>
-					<permission ref="site.reload" mode="set"></permission>
-				</permissions>
-				<label id="reload">Reload</label>
-				<icon>reload</icon>
-				<confirmation id="site.reload.confirm" params="#{name}">Reload site #{name}?</confirmation>
-			</link>
-			<link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;siteid=${current.id}">
-				<condition expression="${current.state.name() eq 'STARTED'}" />
-				<permissions>
-					<permission ref="site.reload" mode="set"></permission>
-				</permissions>
-				<label id="reload.template">Reload Template</label>
-				<icon>reload</icon>
-			</link>
-		</linkpanel>
-	</config>
-	<data>
-		<selectionGroup>
-			<selection id="f_sn" type="text">
-				<title id="name">Name</title>
-				<option value="" name="f_sn" />
-			</selection>
-			<selection id="f_sd" type="text">
-				<title id="domain">Domain</title>
-				<option value="" name="f_sd" />
-			</selection>
-			<selection id="f_sa" type="radio">
-				<title id="active">Active</title>
-				<option value="all" name="all" selected="true" />
-				<option value="true" name="yes" selected="false" />
-				<option value="false" name="no" selected="false" />
-			</selection>
-		</selectionGroup>
-		<resultset chunk="0" chunkname="sites" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="2">
-			<result>
-				<field name="name" type="text">
-					<value>localhost</value>
-				</field>
-				<field name="host" type="text">
-					<value>localhost</value>
-				</field>
-				<field name="domain" type="text">
-					<value>localhost</value>
-				</field>
-				<field name="description" type="text">
-					<value></value>
-				</field>
-				<field name="active" type="image">
-					<value>true</value>
-					<icon type="class">led_green</icon>
-				</field>
-				<field name="running" type="image">
-					<value>true</value>
-					<icon type="class">led_green</icon>
-				</field>
-				<field name="startupTime" type="date">
-					<value></value>
-				</field>
-				<linkpanel id="actions" location="inline">
-					<link id="actions[2]" mode="intern" target="/sites?act=stop&amp;siteid=1">
-						<label id="site.stop">Stop</label>
-						<icon>deactivate</icon>
-						<confirmation id="site.stop.confirm" params="#{name}">Stop site localhost?</confirmation>
-					</link>
-					<link id="actions[3]" mode="intern" target="/sites/update/1" default="true">
-						<label id="edit">Edit</label>
-						<icon>edit</icon>
-					</link>
-					<link id="actions[5]" mode="intern" target="/sites?act=reload&amp;siteid=1">
-						<label id="reload">Reload</label>
-						<icon>reload</icon>
-						<confirmation id="site.reload.confirm" params="#{name}">Reload site localhost?</confirmation>
-					</link>
-					<link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;siteid=1">
-						<label id="reload.template">Reload Template</label>
-						<icon>reload</icon>
-					</link>
-				</linkpanel>
-			</result>
-			<result>
-				<field name="name" type="text">
-					<value>site2</value>
-				</field>
-				<field name="host" type="text">
-					<value>example.com</value>
-				</field>
-				<field name="domain" type="text">
-					<value>example.com</value>
-				</field>
-				<field name="description" type="text">
-					<value>a description</value>
-				</field>
-				<field name="active" type="image">
-					<value>true</value>
-					<icon type="class">led_green</icon>
-				</field>
-				<field name="running" type="image">
-					<value>false</value>
-					<icon type="class">led_red</icon>
-				</field>
-				<field name="startupTime" type="date">
-					<value></value>
-				</field>
-				<linkpanel id="actions" location="inline">
-					<link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=3">
-						<label id="site.start">Start</label>
-						<icon>activate</icon>
-					</link>
-					<link id="actions[3]" mode="intern" target="/sites/update/3" default="true">
-						<label id="edit">Edit</label>
-						<icon>edit</icon>
-					</link>
-					<link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=3">
-						<label id="delete">Delete</label>
-						<icon>delete</icon>
-						<confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "site2"?</confirmation>
-					</link>
-					<link id="actions[5]" mode="intern" target="" disabled="true">
-						<label id="reload">Reload</label>
-						<icon>reload</icon>
-					</link>
-				</linkpanel>
-			</result>
-		</resultset>
-	</data>
+    <config>
+        <title id="sites">Sites</title>
+        <permissions>
+            <permission ref="site.list" mode="set"></permission>
+        </permissions>
+        <params>
+            <param name="name"/>
+            <param name="domain"/>
+            <param name="active"/>
+        </params>
+        <meta-data bindClass="org.appng.api.model.Site">
+            <field name="name" type="text" binding="name">
+                <sort/>
+                <label id="name">Name</label>
+            </field>
+            <field name="host" type="text" binding="host">
+                <sort/>
+                <label id="host">Host</label>
+            </field>
+            <field name="domain" type="text" binding="domain">
+                <sort/>
+                <label id="domain">Domain</label>
+            </field>
+            <field name="description" type="text" binding="description">
+                <label id="description">Description</label>
+            </field>
+            <field name="active" type="image" binding="active">
+                <sort/>
+                <label id="active">Active</label>
+                <icon condition="${current.active}">led_green</icon>
+                <icon condition="${!current.active}">led_red</icon>
+            </field>
+            <field name="running" type="image" binding="running">
+                <label id="running">Running</label>
+                <icon condition="${current.running}">led_green</icon>
+                <icon condition="${!current.running}">led_red</icon>
+            </field>
+            <field name="startupTime" type="date" format="yyyy-MM-dd HH:mm:ss" binding="startupTime">
+                <label id="startupTime">Startup time</label>
+            </field>
+            <field name="actions" type="linkpanel" binding="actions">
+                <label id="actions">Actions</label>
+            </field>
+        </meta-data>
+        <linkpanel id="other" location="both">
+            <link id="other[1]" mode="intern" target="/sites/create">
+                <permissions>
+                    <permission ref="site.create" mode="set"></permission>
+                </permissions>
+                <label id="site.create">Create site</label>
+                <icon>new</icon>
+            </link>
+        </linkpanel>
+        <linkpanel id="actions" location="inline">
+            <link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=${current.id}">
+                <condition expression="${current.active and current.state.name() eq 'STOPPED'}"/>
+                <permissions>
+                    <permission ref="site.reload" mode="set"></permission>
+                </permissions>
+                <label id="site.start">Start</label>
+                <icon>activate</icon>
+            </link>
+            <link id="actions[2]" mode="intern" target="/sites?act=stop&amp;siteid=${current.id}">
+                <condition expression="${current.state.name() eq 'STARTED'}"/>
+                <permissions>
+                    <permission ref="site.reload" mode="set"></permission>
+                </permissions>
+                <label id="site.stop">Stop</label>
+                <icon>deactivate</icon>
+                <confirmation id="site.stop.confirm" params="#{name}">Stop site #{name}?</confirmation>
+            </link>
+            <link id="actions[3]" mode="intern" target="/sites/update/${current.id}" default="true">
+                <permissions>
+                    <permission ref="site.edit" mode="set"></permission>
+                </permissions>
+                <label id="edit">Edit</label>
+                <icon>edit</icon>
+            </link>
+            <link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=${current.id}">
+                <condition expression="${current.state.name() eq 'STOPPED'}"/>
+                <permissions>
+                    <permission ref="site.delete" mode="set"></permission>
+                </permissions>
+                <label id="delete">Delete</label>
+                <icon>delete</icon>
+                <confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "#{name}"?</confirmation>
+            </link>
+            <link id="actions[5]" mode="intern" target="/sites?act=reload&amp;siteid=${current.id}" show-disabled="true">
+                <condition expression="${current.state.name() eq 'STARTED'}"/>
+                <permissions>
+                    <permission ref="site.reload" mode="set"></permission>
+                </permissions>
+                <label id="reload">Reload</label>
+                <icon>reload</icon>
+                <confirmation id="site.reload.confirm" params="#{name}">Reload site #{name}?</confirmation>
+            </link>
+            <link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;sitename=${current.name}">
+                <condition expression="${current.state.name() eq 'STARTED'}"/>
+                <permissions>
+                    <permission ref="site.reload" mode="set"></permission>
+                </permissions>
+                <label id="reload.template">Reload Template</label>
+                <icon>reload</icon>
+            </link>
+        </linkpanel>
+    </config>
+    <data>
+        <selectionGroup>
+            <selection id="f_sn" type="text">
+                <title id="name">Name</title>
+                <option value="" name="f_sn"/>
+            </selection>
+            <selection id="f_sd" type="text">
+                <title id="domain">Domain</title>
+                <option value="" name="f_sd"/>
+            </selection>
+            <selection id="f_sa" type="radio">
+                <title id="active">Active</title>
+                <option value="all" name="all" selected="true"/>
+                <option value="true" name="yes" selected="false"/>
+                <option value="false" name="no" selected="false"/>
+            </selection>
+        </selectionGroup>
+        <resultset chunk="0" chunkname="sites" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="2">
+            <result>
+                <field name="name" type="text">
+                    <value>localhost</value>
+                </field>
+                <field name="host" type="text">
+                    <value>localhost</value>
+                </field>
+                <field name="domain" type="text">
+                    <value>localhost</value>
+                </field>
+                <field name="description" type="text">
+                    <value></value>
+                </field>
+                <field name="active" type="image">
+                    <value>true</value>
+                    <icon type="class">led_green</icon>
+                </field>
+                <field name="running" type="image">
+                    <value>true</value>
+                    <icon type="class">led_green</icon>
+                </field>
+                <field name="startupTime" type="date">
+                    <value></value>
+                </field>
+                <linkpanel id="actions" location="inline">
+                    <link id="actions[2]" mode="intern" target="/sites?act=stop&amp;siteid=1">
+                        <label id="site.stop">Stop</label>
+                        <icon>deactivate</icon>
+                        <confirmation id="site.stop.confirm" params="#{name}">Stop site localhost?</confirmation>
+                    </link>
+                    <link id="actions[3]" mode="intern" target="/sites/update/1" default="true">
+                        <label id="edit">Edit</label>
+                        <icon>edit</icon>
+                    </link>
+                    <link id="actions[5]" mode="intern" target="/sites?act=reload&amp;siteid=1">
+                        <label id="reload">Reload</label>
+                        <icon>reload</icon>
+                        <confirmation id="site.reload.confirm" params="#{name}">Reload site localhost?</confirmation>
+                    </link>
+                    <link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;sitename=localhost">
+                        <label id="reload.template">Reload Template</label>
+                        <icon>reload</icon>
+                    </link>
+                </linkpanel>
+            </result>
+            <result>
+                <field name="name" type="text">
+                    <value>site2</value>
+                </field>
+                <field name="host" type="text">
+                    <value>example.com</value>
+                </field>
+                <field name="domain" type="text">
+                    <value>example.com</value>
+                </field>
+                <field name="description" type="text">
+                    <value>a description</value>
+                </field>
+                <field name="active" type="image">
+                    <value>true</value>
+                    <icon type="class">led_green</icon>
+                </field>
+                <field name="running" type="image">
+                    <value>false</value>
+                    <icon type="class">led_red</icon>
+                </field>
+                <field name="startupTime" type="date">
+                    <value></value>
+                </field>
+                <linkpanel id="actions" location="inline">
+                    <link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=3">
+                        <label id="site.start">Start</label>
+                        <icon>activate</icon>
+                    </link>
+                    <link id="actions[3]" mode="intern" target="/sites/update/3" default="true">
+                        <label id="edit">Edit</label>
+                        <icon>edit</icon>
+                    </link>
+                    <link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=3">
+                        <label id="delete">Delete</label>
+                        <icon>delete</icon>
+                        <confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "site2"?</confirmation>
+                    </link>
+                    <link id="actions[5]" mode="intern" target="" disabled="true">
+                        <label id="reload">Reload</label>
+                        <icon>reload</icon>
+                    </link>
+                </linkpanel>
+            </result>
+        </resultset>
+    </data>
 </datasource>
diff --git a/src/test/resources/xml/SitesTest-testShowSitesFiltered.xml b/src/test/resources/xml/SitesTest-testShowSitesFiltered.xml
index e6b182e..8c5a45c 100644
--- a/src/test/resources/xml/SitesTest-testShowSitesFiltered.xml
+++ b/src/test/resources/xml/SitesTest-testShowSitesFiltered.xml
@@ -1,173 +1,173 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <datasource xmlns="http://www.appng.org/schema/platform" id="sites">
-	<config>
-		<title id="sites">Sites</title>
-		<permissions>
-			<permission ref="site.list" mode="set"></permission>
-		</permissions>
-		<params>
-			<param name="name">site</param>
-			<param name="domain">example</param>
-			<param name="active">true</param>
-		</params>
-		<meta-data bindClass="org.appng.api.model.Site">
-			<field name="name" type="text" binding="name">
-				<sort />
-				<label id="name">Name</label>
-			</field>
-			<field name="host" type="text" binding="host">
-				<sort />
-				<label id="host">Host</label>
-			</field>
-			<field name="domain" type="text" binding="domain">
-				<sort />
-				<label id="domain">Domain</label>
-			</field>
-			<field name="description" type="text" binding="description">
-				<label id="description">Description</label>
-			</field>
-			<field name="active" type="image" binding="active">
-				<sort />
-				<label id="active">Active</label>
-				<icon condition="${current.active}">led_green</icon>
-				<icon condition="${!current.active}">led_red</icon>
-			</field>
-			<field name="running" type="image" binding="running">
-				<label id="running">Running</label>
-				<icon condition="${current.running}">led_green</icon>
-				<icon condition="${!current.running}">led_red</icon>
-			</field>
-			<field name="startupTime" type="date" format="yyyy-MM-dd HH:mm:ss" binding="startupTime">
-				<label id="startupTime">Startup time</label>
-			</field>
-			<field name="actions" type="linkpanel" binding="actions">
-				<label id="actions">Actions</label>
-			</field>
-		</meta-data>
-		<linkpanel id="other" location="both">
-			<link id="other[1]" mode="intern" target="/sites/create">
-				<permissions>
-					<permission ref="site.create" mode="set"></permission>
-				</permissions>
-				<label id="site.create">Create site</label>
-				<icon>new</icon>
-			</link>
-		</linkpanel>
-		<linkpanel id="actions" location="inline">
-			<link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=${current.id}">
-				<condition expression="${current.active and current.state.name() eq 'STOPPED'}" />
-				<permissions>
-					<permission ref="site.reload" mode="set"></permission>
-				</permissions>
-				<label id="site.start">Start</label>
-				<icon>activate</icon>
-			</link>
-			<link id="actions[2]" mode="intern" target="/sites?act=stop&amp;siteid=${current.id}">
-				<condition expression="${current.state.name() eq 'STARTED'}" />
-				<permissions>
-					<permission ref="site.reload" mode="set"></permission>
-				</permissions>
-				<label id="site.stop">Stop</label>
-				<icon>deactivate</icon>
-				<confirmation id="site.stop.confirm" params="#{name}">Stop site #{name}?</confirmation>
-			</link>
-			<link id="actions[3]" mode="intern" target="/sites/update/${current.id}" default="true">
-				<permissions>
-					<permission ref="site.edit" mode="set"></permission>
-				</permissions>
-				<label id="edit">Edit</label>
-				<icon>edit</icon>
-			</link>
-			<link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=${current.id}">
-				<condition expression="${current.state.name() eq 'STOPPED'}" />
-				<permissions>
-					<permission ref="site.delete" mode="set"></permission>
-				</permissions>
-				<label id="delete">Delete</label>
-				<icon>delete</icon>
-				<confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "#{name}"?</confirmation>
-			</link>
-			<link id="actions[5]" mode="intern" target="/sites?act=reload&amp;siteid=${current.id}" show-disabled="true">
-				<condition expression="${current.state.name() eq 'STARTED'}" />
-				<permissions>
-					<permission ref="site.reload" mode="set"></permission>
-				</permissions>
-				<label id="reload">Reload</label>
-				<icon>reload</icon>
-				<confirmation id="site.reload.confirm" params="#{name}">Reload site #{name}?</confirmation>
-			</link>
-			<link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;siteid=${current.id}">
-				<condition expression="${current.state.name() eq 'STARTED'}" />
-				<permissions>
-					<permission ref="site.reload" mode="set"></permission>
-				</permissions>
-				<label id="reload.template">Reload Template</label>
-				<icon>reload</icon>
-			</link>
-		</linkpanel>
-	</config>
-	<data>
-		<selectionGroup>
-			<selection id="f_sn" type="text">
-				<title id="name">Name</title>
-				<option value="site" name="f_sn" />
-			</selection>
-			<selection id="f_sd" type="text">
-				<title id="domain">Domain</title>
-				<option value="example" name="f_sd" />
-			</selection>
-			<selection id="f_sa" type="radio">
+    <config>
+        <title id="sites">Sites</title>
+        <permissions>
+            <permission ref="site.list" mode="set"></permission>
+        </permissions>
+        <params>
+            <param name="name">site</param>
+            <param name="domain">example</param>
+            <param name="active">true</param>
+        </params>
+        <meta-data bindClass="org.appng.api.model.Site">
+            <field name="name" type="text" binding="name">
+                <sort/>
+                <label id="name">Name</label>
+            </field>
+            <field name="host" type="text" binding="host">
+                <sort/>
+                <label id="host">Host</label>
+            </field>
+            <field name="domain" type="text" binding="domain">
+                <sort/>
+                <label id="domain">Domain</label>
+            </field>
+            <field name="description" type="text" binding="description">
+                <label id="description">Description</label>
+            </field>
+            <field name="active" type="image" binding="active">
+                <sort/>
+                <label id="active">Active</label>
+                <icon condition="${current.active}">led_green</icon>
+                <icon condition="${!current.active}">led_red</icon>
+            </field>
+            <field name="running" type="image" binding="running">
+                <label id="running">Running</label>
+                <icon condition="${current.running}">led_green</icon>
+                <icon condition="${!current.running}">led_red</icon>
+            </field>
+            <field name="startupTime" type="date" format="yyyy-MM-dd HH:mm:ss" binding="startupTime">
+                <label id="startupTime">Startup time</label>
+            </field>
+            <field name="actions" type="linkpanel" binding="actions">
+                <label id="actions">Actions</label>
+            </field>
+        </meta-data>
+        <linkpanel id="other" location="both">
+            <link id="other[1]" mode="intern" target="/sites/create">
+                <permissions>
+                    <permission ref="site.create" mode="set"></permission>
+                </permissions>
+                <label id="site.create">Create site</label>
+                <icon>new</icon>
+            </link>
+        </linkpanel>
+        <linkpanel id="actions" location="inline">
+            <link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=${current.id}">
+                <condition expression="${current.active and current.state.name() eq 'STOPPED'}"/>
+                <permissions>
+                    <permission ref="site.reload" mode="set"></permission>
+                </permissions>
+                <label id="site.start">Start</label>
+                <icon>activate</icon>
+            </link>
+            <link id="actions[2]" mode="intern" target="/sites?act=stop&amp;siteid=${current.id}">
+                <condition expression="${current.state.name() eq 'STARTED'}"/>
+                <permissions>
+                    <permission ref="site.reload" mode="set"></permission>
+                </permissions>
+                <label id="site.stop">Stop</label>
+                <icon>deactivate</icon>
+                <confirmation id="site.stop.confirm" params="#{name}">Stop site #{name}?</confirmation>
+            </link>
+            <link id="actions[3]" mode="intern" target="/sites/update/${current.id}" default="true">
+                <permissions>
+                    <permission ref="site.edit" mode="set"></permission>
+                </permissions>
+                <label id="edit">Edit</label>
+                <icon>edit</icon>
+            </link>
+            <link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=${current.id}">
+                <condition expression="${current.state.name() eq 'STOPPED'}"/>
+                <permissions>
+                    <permission ref="site.delete" mode="set"></permission>
+                </permissions>
+                <label id="delete">Delete</label>
+                <icon>delete</icon>
+                <confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "#{name}"?</confirmation>
+            </link>
+            <link id="actions[5]" mode="intern" target="/sites?act=reload&amp;siteid=${current.id}" show-disabled="true">
+                <condition expression="${current.state.name() eq 'STARTED'}"/>
+                <permissions>
+                    <permission ref="site.reload" mode="set"></permission>
+                </permissions>
+                <label id="reload">Reload</label>
+                <icon>reload</icon>
+                <confirmation id="site.reload.confirm" params="#{name}">Reload site #{name}?</confirmation>
+            </link>
+            <link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;sitename=${current.name}">
+                <condition expression="${current.state.name() eq 'STARTED'}"/>
+                <permissions>
+                    <permission ref="site.reload" mode="set"></permission>
+                </permissions>
+                <label id="reload.template">Reload Template</label>
+                <icon>reload</icon>
+            </link>
+        </linkpanel>
+    </config>
+    <data>
+        <selectionGroup>
+            <selection id="f_sn" type="text">
+                <title id="name">Name</title>
+                <option value="site" name="f_sn"/>
+            </selection>
+            <selection id="f_sd" type="text">
+                <title id="domain">Domain</title>
+                <option value="example" name="f_sd"/>
+            </selection>
+            <selection id="f_sa" type="radio">
                 <title id="active">Active</title>
                 <option value="all" name="all" selected="false"/>
                 <option value="true" name="yes" selected="true"/>
                 <option value="false" name="no" selected="false"/>
             </selection>
-		</selectionGroup>
-		<resultset chunk="0" chunkname="sites" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="1">
-			<result>
-				<field name="name" type="text">
-					<value>site2</value>
-				</field>
-				<field name="host" type="text">
-					<value>example.com</value>
-				</field>
-				<field name="domain" type="text">
-					<value>example.com</value>
-				</field>
-				<field name="description" type="text">
-					<value>a description</value>
-				</field>
-				<field name="active" type="image">
-					<value>true</value>
-					<icon type="class">led_green</icon>
-				</field>
-				<field name="running" type="image">
-					<value>false</value>
-					<icon type="class">led_red</icon>
-				</field>
-				<field name="startupTime" type="date">
-					<value></value>
-				</field>
-				<linkpanel id="actions" location="inline">
-					<link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=3">
-						<label id="site.start">Start</label>
-						<icon>activate</icon>
-					</link>
-					<link id="actions[3]" mode="intern" target="/sites/update/3" default="true">
-						<label id="edit">Edit</label>
-						<icon>edit</icon>
-					</link>
-					<link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=3">
-						<label id="delete">Delete</label>
-						<icon>delete</icon>
-						<confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "site2"?</confirmation>
-					</link>
-					<link id="actions[5]" mode="intern" target="" disabled="true">
-						<label id="reload">Reload</label>
-						<icon>reload</icon>
-					</link>
-				</linkpanel>
-			</result>
-		</resultset>
-	</data>
+        </selectionGroup>
+        <resultset chunk="0" chunkname="sites" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="1">
+            <result>
+                <field name="name" type="text">
+                    <value>site2</value>
+                </field>
+                <field name="host" type="text">
+                    <value>example.com</value>
+                </field>
+                <field name="domain" type="text">
+                    <value>example.com</value>
+                </field>
+                <field name="description" type="text">
+                    <value>a description</value>
+                </field>
+                <field name="active" type="image">
+                    <value>true</value>
+                    <icon type="class">led_green</icon>
+                </field>
+                <field name="running" type="image">
+                    <value>false</value>
+                    <icon type="class">led_red</icon>
+                </field>
+                <field name="startupTime" type="date">
+                    <value></value>
+                </field>
+                <linkpanel id="actions" location="inline">
+                    <link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=3">
+                        <label id="site.start">Start</label>
+                        <icon>activate</icon>
+                    </link>
+                    <link id="actions[3]" mode="intern" target="/sites/update/3" default="true">
+                        <label id="edit">Edit</label>
+                        <icon>edit</icon>
+                    </link>
+                    <link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=3">
+                        <label id="delete">Delete</label>
+                        <icon>delete</icon>
+                        <confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "site2"?</confirmation>
+                    </link>
+                    <link id="actions[5]" mode="intern" target="" disabled="true">
+                        <label id="reload">Reload</label>
+                        <icon>reload</icon>
+                    </link>
+                </linkpanel>
+            </result>
+        </resultset>
+    </data>
 </datasource>