From: Roland Häder <roland@mxchange.org>
Date: Tue, 12 Mar 2019 13:08:51 +0000 (+0100)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5363fe01f05326721f81848563de203d2ae9177a;p=jjobs-war.git

Please cherry-pick:
- rewrote p:column and p:link to have each attribute in a separate line which
  helps reading JSF views/templates
- renamed ADMIN_ASSIGNED_USER_HEADER to ADMIN_USER_HEADER
- added more country i18n strings

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties
index 2e1e662f..989ad4aa 100644
--- a/src/java/org/mxchange/localization/generic_de_DE.properties
+++ b/src/java/org/mxchange/localization/generic_de_DE.properties
@@ -126,9 +126,17 @@ GUEST_ALREADY_USER_CONTINUE_LOGIN_2=einloggen.
 PAGE_TITLE_USER_LOGIN_HOME=Willkommen zum Benutzerbereich
 CONTENT_TITLE_USER_LOGIN_HOME=\u00dcbersicht Ihrer Bewerbungen:
 LOGIN_LINK_LOGOUT=Ausloggen
+COUNTRY_AUSTRIA=\u00d6stereich
+#@TODO Please fix German umlauts!
+COUNTRY_DANMARK=Daenemark
+COUNTRY_FRANCE=Frankreich
 COUNTRY_GERMANY=Deutschland
+COUNTRY_GREECE=Griechenland
+COUNTRY_ITALIA=Italien
 COUNTRY_PHILIPPINES=Philippinen
 #@TODO Please fix German umlauts!
+COUNTRY_TURKEY=Tuerkei
+#@TODO Please fix German umlauts!
 NONE_SELECTED=Nichts ausgewaehlt
 ENTERED_HOUSE_NUMBER_INVALID=Die eingegebene Hausnummer ist ung\u00fcltig.
 ENTERED_ZIP_CODE_INVALID=Die eingegebene Postleitzahl ist ung\u00fcltig.
@@ -296,7 +304,6 @@ ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Vorwahl ausserorts:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Land:
 ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE=Editieren oder l\u00f6schen der L\u00e4nderdaten
 TABLE_SUMMARY_ADMIN_LIST_COUNTRIES=Diese Tabelle listet alle bereits angelegten L\u00e4nderdaten auf.
-COUNTRY_GERMANY=Deutschland
 ADMIN_MENU_MOBILE_PROVIDER_TITLE=Handyanbieter
 ADMIN_LINK_LIST_MOBILE_PROVIDER_TITLE=Hinzuf\u00fcgen, auflisten, \u00e4ndern und l\u00f6schen von Handyanbietern.
 PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST=Handyanbieter verwalten
@@ -798,7 +805,7 @@ ADMIN_EMPTY_LIST_BASIC_DATA=Es befinden sich keine Stammdaten in der Datenbank.
 TABLE_SUMMARY_ADMIN_LIST_BASIC_DATA=Diese Tabelle listet Stammdaten auf.
 #@TODO Please fix German umlauts!
 ADMIN_LINK_SHOW_BASIC_DATA_TITLE=Stammdaten des Unternehmens anzeigen.
-ADMIN_ASSIGNED_USER_HEADER=Zugew. Benutzer:
+ADMIN_USER_HEADER=Benutzer:
 ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE=Benutzerprofil des der Filiale zugewiesenen Benutzers anzeigen.
 ADMIN_LINK_ASSIGN=Zuweisen
 #@TODO Please fix German umlauts!
@@ -999,7 +1006,7 @@ ADMIN_ASSIGN_EMPLOYEE_HEADQUARTER=Hauptsitz einem Mitarbeiter zuweisen:
 ADMIN_ENTER_EMPLOYEE_MOBILE_NUMBER=Geschaefliche Mobilfunknummer des Mitarbeiters eingeben:
 ADMIN_EMPLOYEE_GENERAL_LEGEND=Allgemeine Daten des Mitarbeiters:
 ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE=Geben Sie hier die generellen Daten des Mitarbeiters an.
-ADMIN_ASSIGNED_BRANCH_OFFICE=Zugewiesene Filiale:
+ADMIN_BRANCH_OFFICE_HEADER=Filiale:
 LABEL_BRANCH_OFFICES=Filialen
 ADMIN_DATE_OF_ISSUE=Ausstellungsdatum:
 ADMIN_PAYMENT_TYPE=Zahlungsmethode:
@@ -1160,7 +1167,6 @@ ADMIN_HEADQUARTER_COMPANY_NAME=Firmenname der Hauptstelle:
 ADMIN_HEADQUARTER_COMPANY_NAME_REQUIRED=Bitte geben Sie den Firmennamen der Hauptstelle ein.
 #@TODO Please fix German umlauts!
 ADMIN_SELECT_CONTACT_COUNTRY_REQUIRED=Bitte waehlen Sie das Land fuer diesen Kontakt aus.
-COUNTRY_ITALIA=Italien
 ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE=Bitte geben Sie das Geburtsdatum des Kontaktes ein.
 ADMIN_SELECT_USER_PROFILE_MODE=Profilmodus ausw\u00e4hlen:
 ADMIN_ASSIGN_BRANCH_OFFICE_OWNER=Filialbesitzer/-leiter
@@ -1231,3 +1237,7 @@ BACK=Zurueck
 OPTIONS=Optionen
 ADMIN_BASIC_DATA_COMPANY_SHORT_NAME=Kurzer Firmenname:
 ADMIN_BASIC_DATA_COMPANY_SHORT_NAME_HEADER=Kurzer Name:
+#@TODO Please fix German umlauts!
+AVAILABLE_HEADER=Verfuegbar:
+ADMIN_MANUFACTURER_HEADER=Hersteller:
+ADMIN_ASSIGNED_MANUFACTURER_LABEL=Zugewiesener Hersteller:
diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties
index dd5b371d..46ac1244 100644
--- a/src/java/org/mxchange/localization/generic_en_US.properties
+++ b/src/java/org/mxchange/localization/generic_en_US.properties
@@ -126,8 +126,14 @@ PAGE_TITLE_USER_LOGIN_HOME=Welcome to user area
 CONTENT_TITLE_USER_LOGIN_HOME=Overview of your applications:
 LOGIN_LINK_LOGOUT=Logout
 PAGE_TITLE_LOGIN_AREA=User area
+COUNTRY_AUSTRIA=Austria
+COUNTRY_DANMARK=Danmark
+COUNTRY_FRANCE=France
 COUNTRY_GERMANY=Germany
+COUNTRY_GREECE=Greece
+COUNTRY_ITALIA=Italia
 COUNTRY_PHILIPPINES=Philippines
+COUNTRY_TURKEY=Turkey
 NONE_SELECTED=None selected
 ENTERED_HOUSE_NUMBER_INVALID=The entered house number is invalid.
 ENTERED_ZIP_CODE_INVALID=The entered ZIP code is invalid.
@@ -279,7 +285,6 @@ ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Dial prefix outside:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Country:
 ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE=Edit or delete country
 TABLE_SUMMARY_ADMIN_LIST_COUNTRIES=This table lists all countries.
-COUNTRY_GERMANY=Germany
 ADMIN_MENU_MOBILE_PROVIDER_TITLE=Mobile providers
 ADMIN_LINK_LIST_MOBILE_PROVIDER=List mobile provider
 ADMIN_LINK_LIST_MOBILE_PROVIDER_TITLE=Add, list, edit and delete mobile providers.
@@ -782,7 +787,7 @@ CONTENT_TITLE_ADMIN_LIST_BASIC_DATA=Lists basic company data
 ADMIN_EMPTY_LIST_BASIC_DATA=There are no basic company data in database. Or your search criteria doesn't match anything.
 TABLE_SUMMARY_ADMIN_LIST_BASIC_DATA=This table lists all basic company data.
 ADMIN_LINK_SHOW_BASIC_DATA_TITLE=Show details of this business contact.
-ADMIN_ASSIGNED_USER_HEADER=Assigned user:
+ADMIN_USER_HEADER=User:
 ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE=Shows branch office's assigned user profile.
 ADMIN_LINK_ASSIGN=Assign
 ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE=Assigns this business contact to a user account.
@@ -933,7 +938,7 @@ ADMIN_ASSIGN_EMPLOYEE_HEADQUARTER=Assign headquarter to employee:
 ADMIN_ENTER_EMPLOYEE_MOBILE_NUMBER=Enter business mobile number of employee:
 ADMIN_EMPLOYEE_GENERAL_LEGEND=General data of employee:
 ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE=You can enter here the general data of the employee.
-ADMIN_ASSIGNED_BRANCH_OFFICE=Assigned branch office:
+ADMIN_BRANCH_OFFICE_HEADER=Branch office:
 LABEL_BRANCH_OFFICES=Branch offices
 ADMIN_DATE_OF_ISSUE=Issue date:
 ADMIN_PAYMENT_TYPE=Payment type:
@@ -1054,7 +1059,6 @@ ADMIN_CONTACT_DATA_FAMILY_NAME_REQUIRED=Please enter family name. If unknown, ju
 ADMIN_HEADQUARTER_COMPANY_NAME=Headquarter's company name:
 ADMIN_HEADQUARTER_COMPANY_NAME_REQUIRED=Please enter headquarter's company name.
 ADMIN_SELECT_CONTACT_COUNTRY_REQUIRED=Please select a country for this contact.
-COUNTRY_ITALIA=Italia
 ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE=Please enter birthday of contact.
 ADMIN_SELECT_USER_PROFILE_MODE=Select profile mode:
 ADMIN_ASSIGN_BRANCH_OFFICE_OWNER=Branch office owner/leader
@@ -1122,3 +1126,6 @@ BACK=Back
 OPTIONS=Options
 ADMIN_BASIC_DATA_COMPANY_SHORT_NAME=Company's short name
 ADMIN_BASIC_DATA_COMPANY_SHORT_NAME_HEADER=Short name:
+AVAILABLE_HEADER=Available:
+ADMIN_MANUFACTURER_HEADER=Manufacturer:
+ADMIN_ASSIGNED_MANUFACTURER_LABEL=Assigned manufacturer:
diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
index 3aba308b..9b7c204a 100644
--- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
+++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
@@ -99,7 +99,11 @@
 	<p:column>
 		<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-		<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+		<p:link
+			id="contactEmailAddress"
+			styleClass="table-data-field"
+			href="mailto:#{beanHelper.contact.contactEmailAddress}"
+			>
 			<h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
 		</h:outputLink>
 	</p:column>
diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
index a5a39ef6..698eac9f 100644
--- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
+++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
@@ -34,7 +34,11 @@
 	<p:column>
 		<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-		<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+		<p:link
+			id="contactEmailAddress"
+			styleClass="table-data-field"
+			href="mailto:#{beanHelper.contact.contactEmailAddress}"
+			>
 			<h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
 		</h:outputLink>
 	</p:column>
diff --git a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
index e9e31185..d4b2725a 100644
--- a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
@@ -16,43 +16,69 @@
 			<ul>
 				<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 					<li>
-						<p:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_USER}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
+						<p:link
+							outcome="admin_show_user"
+							value="#{msg.ADMIN_LINK_SHOW_USER}"
+							title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+							>
 							<f:param name="userId" value="#{user.userId}" />
 						</p:link>
 					</li>
 				</ui:fragment>
 
 				<li>
-					<p:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+					<p:link
+						outcome="admin_edit_user"
+						value="#{msg.ADMIN_LINK_EDIT_USER}"
+						title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 				</li>
 
 				<ui:fragment rendered="#{not empty renderContactLinks and renderContactLinks}">
 					<li>
-						<p:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
+						<p:link
+							outcome="admin_edit_contact"
+							value="#{msg.ADMIN_LINK_EDIT_CONTACT}"
+							title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}"
+							>
 							<f:param name="contactId" value="#{user.userContact.contactId}" />
 						</p:link>
 					</li>
 				</ui:fragment>
 
 				<li>
-					<p:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
+					<p:link
+						outcome="admin_resend_user_confirm_link"
+						value="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK}"
+						title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}"
+						rendered="#{user.userAccountStatus == 'UNCONFIRMED'}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 
-					<p:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
+					<p:link
+						outcome="admin_unlock_user"
+						value="#{msg.ADMIN_LINK_UNLOCK_USER}"
+						title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}"
+						rendered="#{user.userAccountStatus == 'LOCKED'}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 
-					<p:link outcome="admin_lock_user">
+					<p:link
+						outcome="admin_lock_user"
+						>
 						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_USER}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 				</li>
 
 				<li>
-					<p:link outcome="admin_delete_user">
+					<p:link
+						outcome="admin_delete_user"
+						>
 						<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_USER}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
@@ -60,14 +86,22 @@
 
 				<ui:fragment rendered="#{not empty renderContactLinks and renderContactLinks}">
 					<li>
-						<p:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA}" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}">
+						<p:link
+							outcome="admin_show_contact"
+							value="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA}"
+							title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+							>
 							<f:param name="contactId" value="#{user.userContact.contactId}" />
 						</p:link>
 					</li>
 				</ui:fragment>
 
 				<li>
-					<p:link outcome="admin_show_user_activity_log" value="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG}" title="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE}">
+					<p:link
+						outcome="admin_show_user_activity_log"
+						value="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG}"
+						title="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 				</li>
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
index 9dba4534..d50ff5e5 100644
--- a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
@@ -51,7 +51,9 @@
 			</h:outputText>
 		</p:column>
 
-		<p:column rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}">
+		<p:column
+			rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}"
+			>
 			<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
 			<h:panelGroup styleClass="table-data-field" layout="block">
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
index 12ba2049..87e71974 100644
--- a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
@@ -51,7 +51,9 @@
 			</h:outputText>
 		</p:column>
 
-		<p:column rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}">
+		<p:column
+			rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}"
+			>
 			<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
 			<h:panelGroup styleClass="table-data-field" layout="block">
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
index ba492542..a5c6bfb2 100644
--- a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
@@ -28,7 +28,10 @@
 		<p:column>
 			<p:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 
-			<p:link id="mobileProvider" outcome="admin_show_mobile_provider">
+			<p:link
+				id="mobileProvider"
+				outcome="admin_show_mobile_provider"
+				>
 				<h:outputText styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerName}" />
 				<f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
 			</p:link>
@@ -56,7 +59,9 @@
 			</h:outputText>
 		</p:column>
 
-		<p:column rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}">
+		<p:column
+			rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}"
+			>
 			<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
 			<h:panelGroup styleClass="table-data-field" layout="block">
diff --git a/web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl b/web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl
index 87118f51..03b2b65a 100644
--- a/web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl
+++ b/web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl
@@ -22,21 +22,29 @@
 			<h:outputText value="#{headerMessage}" />
 		</f:facet>
 
-		<p:column headerText="#{msg.ADMIN_START_WEEK_DAY}">
+		<p:column
+			headerText="#{msg.ADMIN_START_WEEK_DAY}"
+			>
 			<h:outputText value="#{openingTime.openingStartDay.toString()}" />
 		</p:column>
 
-		<p:column headerText="#{msg.ADMIN_END_WEEK_DAY}">
+		<p:column
+			headerText="#{msg.ADMIN_END_WEEK_DAY}"
+			>
 			<h:outputText value="#{openingTime.openingEndDay.toString()}" />
 		</p:column>
 
-		<p:column headerText="#{msg.ADMIN_START_TIME}">
+		<p:column
+			headerText="#{msg.ADMIN_START_TIME}"
+			>
 			<h:outputText value="#{openingTime.openingStartTime}">
 				<f:convertDateTime type="time" timeStyle="short" />
 			</h:outputText>
 		</p:column>
 
-		<p:column headerText="#{msg.ADMIN_END_TIME}">
+		<p:column
+			headerText="#{msg.ADMIN_END_TIME}"
+			>
 			<h:outputText value="#{openingTime.openingEndTime}">
 				<f:convertDateTime type="time" timeStyle="short" />
 			</h:outputText>
diff --git a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
index adcd8f2c..f691140a 100644
--- a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
+++ b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
@@ -10,7 +10,11 @@
 
 	<core:outputMessageBox panelGroupId="nonPublicUserProfile" message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
-	<p:link outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
+	<p:link
+		outcome="user_profile"
+		title="#{msg.LINK_USER_PROFILE_TITLE}"
+		rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}"
+		>
 		<h:outputText value="#{user.userName}" />
 		<f:param name="userId" value="#{user.userId}" />
 	</p:link>
diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl
index e5a3b6e9..13b195c0 100644
--- a/web/WEB-INF/templates/admin/admin_footer.tpl
+++ b/web/WEB-INF/templates/admin/admin_footer.tpl
@@ -9,7 +9,11 @@
 
 	<pm:footer id="footer" fixed="true" tapToggle="false">
 		<ul class="navbar-horizontal">
-			<li><p:link outcome="index" value="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE}" title="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE_TITLE}" /></li>
+			<li><p:link
+					outcome="index"
+					value="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE}"
+					title="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE_TITLE}"
+					/></li>
 		</ul>
 	</pm:footer>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
index 2f836bb6..367fd341 100644
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
@@ -26,7 +26,12 @@
 			<p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
 
 			<h:panelGroup styleClass="table-data-field" layout="block">
-				<p:link id="userId" outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+				<p:link
+					id="userId"
+					outcome="admin_show_user"
+					title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+					value="#{beanHelper.user.userId}"
+					>
 					<f:param name="userId" value="#{beanHelper.user.userId}" />
 				</p:link>
 			</h:panelGroup>
diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
index 1b9e3559..d8c9600f 100644
--- a/web/WEB-INF/templates/guest/guest_footer.tpl
+++ b/web/WEB-INF/templates/guest/guest_footer.tpl
@@ -10,30 +10,50 @@
 	<div class="footer">
 		<ul class="navbar-horizontal">
 			<li class="navlink-horizontal">
-				<p:link outcome="index" title="#{msg.GUEST_LINK_HOME_TITLE}" value="#{msg.GUEST_LINK_HOME}" />
+				<p:link
+					outcome="index"
+					value="#{msg.GUEST_LINK_HOME}"
+					title="#{msg.GUEST_LINK_HOME_TITLE}"
+					/>
 			</li>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="user_resend_link" title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}" value="#{msg.GUEST_LINK_RESEND_LINK}" />
+					<p:link
+						outcome="user_resend_link"
+						value="#{msg.GUEST_LINK_RESEND_LINK}"
+						title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="imprint" title="#{msg.GUEST_LINK_IMPRINT_TITLE}" value="#{msg.GUEST_LINK_IMPRINT}" />
+					<p:link
+						outcome="imprint"
+						value="#{msg.GUEST_LINK_IMPRINT}"
+						title="#{msg.GUEST_LINK_IMPRINT_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="terms" title="#{msg.GUEST_LINK_TERMS_TITLE}" value="#{msg.GUEST_LINK_TERMS}" />
+					<p:link
+						outcome="terms"
+						value="#{msg.GUEST_LINK_TERMS}"
+						title="#{msg.GUEST_LINK_TERMS_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="privacy" title="#{msg.GUEST_LINK_PRIVACY_TITLE}" value="#{msg.GUEST_LINK_PRIVACY}" />
+					<p:link
+						outcome="privacy"
+						value="#{msg.GUEST_LINK_PRIVACY}"
+						title="#{msg.GUEST_LINK_PRIVACY_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index c58beb58..61136ff4 100644
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -15,7 +15,11 @@
 
 			<ul>
 				<li>
-					<p:link title="#{msg.GUEST_LINK_HOME_TITLE}" outcome="index" value="#{msg.GUEST_LINK_HOME}" />
+					<p:link
+						outcome="index"
+						value="#{msg.GUEST_LINK_HOME}"
+						title="#{msg.GUEST_LINK_HOME_TITLE}"
+						/>
 				</li>
 			</ul>
 
@@ -26,25 +30,41 @@
 			<ul>
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 					<li>
-						<p:link title="#{msg.GUEST_LOGIN_LINK_TITLE}" outcome="user_login" value="#{msg.GUEST_LINK_LOGIN}" />
+						<p:link
+							outcome="user_login"
+							value="#{msg.GUEST_LINK_LOGIN}"
+							title="#{msg.GUEST_LOGIN_LINK_TITLE}"
+							/>
 					</li>
 				</ui:fragment>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
 					<li>
-						<p:link title="#{msg.GUEST_LINK_REGISTER_TITLE}" outcome="user_register" value="#{msg.GUEST_LINK_REGISTER}" />
+						<p:link
+							outcome="user_register"
+							value="#{msg.GUEST_LINK_REGISTER}"
+							title="#{msg.GUEST_LINK_REGISTER_TITLE}"
+							/>
 					</li>
 				</ui:fragment>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
 					<li>
-						<p:link title="#{msg.GUEST_LINK_PASSWORD_TITLE}" outcome="user_lost_password" value="#{msg.GUEST_LINK_PASSWORD}" />
+						<p:link
+							outcome="user_lost_password"
+							value="#{msg.GUEST_LINK_PASSWORD}"
+							title="#{msg.GUEST_LINK_PASSWORD_TITLE}"
+							/>
 					</li>
 				</ui:fragment>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 					<li>
-						<p:link title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}" outcome="user_resend_link" value="#{msg.GUEST_LINK_RESEND_LINK}" />
+						<p:link
+							outcome="user_resend_link"
+							value="#{msg.GUEST_LINK_RESEND_LINK}"
+							title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}"
+							/>
 					</li>
 				</ui:fragment>
 			</ul>
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index ca95206b..f57ca4a7 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -24,7 +24,11 @@
 					<!-- @TODO Find something better //-->
 					<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
 					<h:outputText value="&#160;" />
-					<p:link outcome="privacy" target="_blank" value="#{msg.GUEST_LINK_PRIVACY_STATEMENTS}" />
+					<p:link
+						outcome="privacy"
+						target="_blank"
+						value="#{msg.GUEST_LINK_PRIVACY_STATEMENTS}"
+						/>
 					<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
 				</div>
 			</h:panelGroup>
@@ -44,7 +48,11 @@
 					<!-- @TODO Find something better //-->
 					<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
 					<h:outputText value="&#160;" />
-					<p:link outcome="terms" target="_blank" value="#{msg.GUEST_LINK_TERMS_CONDITIONS}" />
+					<p:link
+						outcome="terms"
+						target="_blank"
+						value="#{msg.GUEST_LINK_TERMS_CONDITIONS}"
+						/>
 					<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl
index d9f177d8..c3e71d5a 100644
--- a/web/WEB-INF/templates/login/user/user_footer.tpl
+++ b/web/WEB-INF/templates/login/user/user_footer.tpl
@@ -10,24 +10,40 @@
 	<div class="footer">
 		<ul class="navbar-horizontal">
 			<li class="navlink-horizontal">
-				<p:link outcome="login_index" title="#{msg.LOGIN_LINK_HOME_TITLE}" value="#{msg.LOGIN_LINK_HOME}" />
+				<p:link
+					outcome="login_index"
+					value="#{msg.LOGIN_LINK_HOME}"
+					title="#{msg.LOGIN_LINK_HOME_TITLE}"
+					/>
 			</li>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="imprint" title="#{msg.GUEST_LINK_IMPRINT_TITLE}" value="#{msg.GUEST_LINK_IMPRINT}" />
+					<p:link
+						outcome="imprint"
+						value="#{msg.GUEST_LINK_IMPRINT}"
+						title="#{msg.GUEST_LINK_IMPRINT_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="terms" title="#{msg.GUEST_LINK_TERMS_TITLE}" value="#{msg.GUEST_LINK_TERMS}" />
+					<p:link
+						outcome="terms"
+						value="#{msg.GUEST_LINK_TERMS}"
+						title="#{msg.GUEST_LINK_TERMS_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="privacy" title="#{msg.GUEST_LINK_PRIVACY_TITLE}" value="#{msg.GUEST_LINK_PRIVACY}" />
+					<p:link
+						outcome="privacy"
+						value="#{msg.GUEST_LINK_PRIVACY}"
+						title="#{msg.GUEST_LINK_PRIVACY_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl
index f707404a..43e4cb62 100644
--- a/web/WEB-INF/templates/login/user/user_menu.tpl
+++ b/web/WEB-INF/templates/login/user/user_menu.tpl
@@ -15,16 +15,28 @@
 
 			<ul>
 				<li>
-					<p:link title="#{msg.LOGIN_LINK_HOME_TITLE}" outcome="user_index" value="#{msg.LOGIN_LINK_HOME}" />
+					<p:link
+						outcome="user_index"
+						value="#{msg.LOGIN_LINK_HOME}"
+						title="#{msg.LOGIN_LINK_HOME_TITLE}"
+						/>
 				</li>
 
 				<li>
-					<p:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+					<p:link
+						outcome="user_list"
+						value="#{msg.LINK_USER_LIST}"
+						title="#{msg.LINK_USER_LIST_TITLE}"
+						/>
 				</li>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_list')}">
 					<li>
-						<p:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+						<p:link
+							outcome="user_list"
+							value="#{msg.LINK_USER_LIST}"
+							title="#{msg.LINK_USER_LIST_TITLE}"
+							/>
 					</li>
 				</ui:fragment>
 			</ul>
@@ -37,19 +49,31 @@
 				<ul>
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_personal_data')}">
 						<li>
-							<p:link title="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA}" />
+							<p:link
+								outcome="login_change_personal_data"
+								value="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA}"
+								title="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA_TITLE}"
+								/>
 						</li>
 					</ui:fragment>
 
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_change_email_address')}">
 						<li>
-							<p:link title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}" />
+							<p:link
+								outcome="login_change_email_address"
+								value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}"
+								title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}"
+								/>
 						</li>
 					</ui:fragment>
 
 					<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword() or featureController.isFeatureEnabled('change_user_password')}">
 						<li>
-							<p:link title="#{msg.LOGIN_LINK_CHANGE_PASSWORD_TITLE}" outcome="user_change_password" value="#{msg.LOGIN_LINK_CHANGE_PASSWORD}" />
+							<p:link
+								outcome="user_change_password"
+								value="#{msg.LOGIN_LINK_CHANGE_PASSWORD}"
+								title="#{msg.LOGIN_LINK_CHANGE_PASSWORD_TITLE}"
+								/>
 						</li>
 					</ui:fragment>
 				</ul>
@@ -61,7 +85,11 @@
 
 			<ul>
 				<li>
-					<p:link title="#{msg.LOGIN_LINK_ALL_APPLICATIONS_TITLE}" outcome="user_all_applications" value="#{msg.LOGIN_LINK_ALL_APPLICATIONS}" />
+					<p:link
+						outcome="user_all_applications"
+						value="#{msg.LOGIN_LINK_ALL_APPLICATIONS}"
+						title="#{msg.LOGIN_LINK_ALL_APPLICATIONS_TITLE}"
+						/>
 				</li>
 			</ul>
 
@@ -71,11 +99,19 @@
 
 			<ul>
 				<li>
-					<p:link title="#{msg.GUEST_LINK_HOME_TITLE}" outcome="index" value="#{msg.GUEST_LINK_HOME}" />
+					<p:link
+						outcome="index"
+						value="#{msg.GUEST_LINK_HOME}"
+						title="#{msg.GUEST_LINK_HOME_TITLE}"
+						/>
 				</li>
 
 				<li>
-					<p:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
+					<p:link
+						outcome="logout"
+						value="#{msg.LINK_CLOSE_SESSION}"
+						title="#{msg.LINK_CLOSE_SESSION_TITLE}"
+						/>
 				</li>
 			</ul>
 		</h:panelGroup>
diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml
index 54ef0633..8ee0448a 100644
--- a/web/admin/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/basic_data/admin_basic_data_list.xhtml
@@ -79,13 +79,26 @@
 					oncomplete="PF('basicDataDialog').show()"
 					/>
 
-				<p:column headerText="#{msg.ID_HEADER}" sortBy="#{basicData.basicDataId}" filterable="false">
-					<p:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}" value="#{basicData.basicDataId}">
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{basicData.basicDataId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_basic_data"
+						value="#{basicData.basicDataId}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+						>
 						<f:param name="basicDataId" value="#{basicData.basicDataId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_SHORT_NAME_HEADER}" sortBy="#{basicData.companyShortName}" filterBy="#{basicData.companyShortName}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_SHORT_NAME_HEADER}"
+					sortBy="#{basicData.companyShortName}"
+					filterBy="#{basicData.companyShortName}"
+					filterMatchMode="contains"
+					>
 					<h:outputLink value="#{basicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty basicData.companyWebsiteUrl}">
 						<h:outputText value="#{basicData.companyShortName}" />
 					</h:outputLink>
@@ -93,13 +106,23 @@
 					<h:outputText value="#{basicData.companyShortName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty basicData.companyWebsiteUrl}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{basicData.companyName}" filterBy="#{basicData.companyName}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}"
+					sortBy="#{basicData.companyName}"
+					filterBy="#{basicData.companyName}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{basicData.companyName}" rendered="#{not empty basicData.companyName}" />
 
 					<h:outputText value="-" rendered="#{empty basicData.companyName}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}" sortBy="#{basicData.companyContactEmployee}" filterBy="#{basicData.companyContactEmployee}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}"
+					sortBy="#{basicData.companyContactEmployee}"
+					filterBy="#{basicData.companyContactEmployee}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -120,16 +143,31 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(basicData.companyContactEmployee)}" rendered="#{not empty basicData.companyContactEmployee}">
+					<p:link
+						outcome="admin_show_employee"
+						value="#{beanHelper.renderEmployee(basicData.companyContactEmployee)}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_CONTACT_PERSON_TITLE}"
+						rendered="#{not empty basicData.companyContactEmployee}"
+						>
 						<f:param name="employeeId" value="#{basicData.companyContactEmployee.employeeId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_basic_data_employee" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON}" rendered="#{empty basicData.companyContactEmployee}">
+					<p:link
+						outcome="admin_assign_basic_data_employee"
+						value="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON}"
+						title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_CONTACT_PERSON_TITLE}"
+						rendered="#{empty basicData.companyContactEmployee}"
+						>
 						<f:param name="basicDataId" value="#{basicData.basicDataId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_FOUNDER_HEADER}" sortBy="#{basicData.companyFounder}" filterBy="#{basicData.companyFounder}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_FOUNDER_HEADER}"
+					sortBy="#{basicData.companyFounder}"
+					filterBy="#{basicData.companyFounder}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -150,16 +188,31 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_COMPANY_FOUNDER_TITLE}" value="#{beanHelper.renderEmployee(basicData.companyFounder)}" rendered="#{not empty basicData.companyFounder}">
+					<p:link
+						outcome="admin_show_employee"
+						value="#{beanHelper.renderEmployee(basicData.companyFounder)}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_COMPANY_FOUNDER_TITLE}"
+						rendered="#{not empty basicData.companyFounder}"
+						>
 						<f:param name="employeeId" value="#{basicData.companyFounder.employeeId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_basic_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_COMPANY_FOUNDER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyFounder}">
+					<p:link
+						outcome="admin_assign_basic_data_contact"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_COMPANY_FOUNDER_TITLE}"
+						rendered="#{empty basicData.companyFounder}"
+						>
 						<f:param name="basicDataId" value="#{basicData.basicDataId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{basicData.companyUserOwner}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_USER_HEADER}"
+					sortBy="#{basicData.companyUserOwner}"
+					filterBy="#{basicData.companyUserOwner}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -180,26 +233,48 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(basicData.companyUserOwner)}" rendered="#{not empty basicData.companyUserOwner}">
+					<p:link
+						outcome="admin_show_user"
+						value="#{beanHelper.renderUser(basicData.companyUserOwner)}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE}"
+						rendered="#{not empty basicData.companyUserOwner}"
+						>
 						<f:param name="userId" value="#{basicData.companyUserOwner.userId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_basic_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
+					<p:link
+						outcome="admin_assign_basic_data_owner"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE}"
+						rendered="#{empty basicData.companyUserOwner}"
+						>
 						<f:param name="basicDataId" value="#{basicData.basicDataId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.TAX_NUMBER_HEADER}" sortBy="#{basicData.companyTaxNumber}" filterBy="#{basicData.companyTaxNumber}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.TAX_NUMBER_HEADER}"
+					sortBy="#{basicData.companyTaxNumber}"
+					filterBy="#{basicData.companyTaxNumber}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{basicData.companyTaxNumber}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{basicData.companyCreated}">
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{basicData.companyCreated}"
+					>
 					<h:outputText id="companyCreated" value="#{basicData.companyCreated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
 					<links:outputBasicDataAdminDropdownMenu basicData="#{basicData}" />
 				</p:column>
 			</p:dataTable>
diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index b7abea68..f155a9a3 100644
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -80,13 +80,36 @@
 					oncomplete="PF('branchOfficeDialog').show()"
 					/>
 
-				<p:column headerText="#{msg.ID_HEADER}" sortBy="#{branchOffice.branchId}" filterable="false">
-					<p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{branchOffice.branchId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_branch_office"
+						value="#{branchOffice.branchId}"
+						title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
+						>
 						<f:param name="branchId" value="#{branchOffice.branchId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{branchOffice.branchCompany}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.BRANCH_OFFICE_NUMBER_HEADER}"
+					sortBy="#{branchOffice.branchNumber}"
+					filterBy="#{branchOffice.branchNumber}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{branchOffice.branchNumber}" rendered="#{not empty branchOffice.branchNumber}" />
+					<h:outputText value="-" rendered="#{empty branchOffice.branchNumber}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}"
+					sortBy="#{branchOffice.branchCompany}"
+					filterBy="#{branchOffice.branchCompany}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -116,7 +139,12 @@
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{branchOffice.branchUserOwner}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_USER_HEADER}"
+					sortBy="#{branchOffice.branchUserOwner}"
+					filterBy="#{branchOffice.branchUserOwner}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -137,26 +165,55 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(branchOffice.branchUserOwner)}" rendered="#{not empty branchOffice.branchUserOwner}">
+					<p:link
+						outcome="admin_show_user"
+						value="#{beanHelper.renderUser(branchOffice.branchUserOwner)}"
+						title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}"
+						rendered="#{not empty branchOffice.branchUserOwner}"
+						>
 						<f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
+					<p:link
+						outcome="admin_assign_branch_office_owner"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}"
+						rendered="#{empty branchOffice.branchUserOwner}"
+						>
 						<f:param name="branchId" value="#{branchOffice.branchId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{branchOffice.branchEmailAddress}" filterBy="#{branchOffice.branchEmailAddress}" filterMatchMode="contains">
-					<p:link href="mailto:#{branchOffice.branchEmailAddress}" value="#{branchOffice.branchEmailAddress}" rendered="#{not empty branchOffice.branchEmailAddress}" />
+				<p:column
+					headerText="#{msg.DATA_EMAIL_ADDRESS}"
+					sortBy="#{branchOffice.branchEmailAddress}"
+					filterBy="#{branchOffice.branchEmailAddress}"
+					filterMatchMode="contains"
+					>
+					<p:link
+						href="mailto:#{branchOffice.branchEmailAddress}"
+						value="#{branchOffice.branchEmailAddress}"
+						rendered="#{not empty branchOffice.branchEmailAddress}"
+						/>
 
 					<h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty branchOffice.branchEmailAddress}" />
 				</p:column>
 
-				<p:column headerText="#{msg.DATA_ADDRESS}" sortBy="#{branchOffice.branchCity}" filterBy="#{branchOffice.branchCity}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.DATA_ADDRESS}"
+					sortBy="#{branchOffice.branchCity}"
+					filterBy="#{branchOffice.branchCity}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{beanHelper.renderBranchOffice(branchOffice)}" title="#{beanHelper.renderBranchOffice(branchOffice)}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}" sortBy="#{branchOffice.branchContactEmployee}" filterBy="#{branchOffice.branchContactEmployee}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}"
+					sortBy="#{branchOffice.branchContactEmployee}"
+					filterBy="#{branchOffice.branchContactEmployee}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -177,22 +234,40 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(branchOffice.branchContactEmployee)}" rendered="#{not empty branchOffice.branchContactEmployee}">
+					<p:link
+						outcome="admin_show_employee"
+						value="#{beanHelper.renderEmployee(branchOffice.branchContactEmployee)}"
+						title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}"
+						rendered="#{not empty branchOffice.branchContactEmployee}"
+						>
 						<f:param name="employeeId" value="#{branchOffice.branchContactEmployee.employeeId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_branch_office_employee" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchContactEmployee}">
+					<p:link
+						outcome="admin_assign_branch_office_employee"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}"
+						rendered="#{empty branchOffice.branchContactEmployee}"
+						>
 						<f:param name="branchId" value="#{branchOffice.branchId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{branchOffice.branchCreated}" filterable="false">
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{branchOffice.branchCreated}"
+					filterable="false"
+					>
 					<h:outputText id="branchCreated" value="#{branchOffice.branchCreated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
 					<links:outputBranchOfficeAdminDropdownMenu branchOffice="#{branchOffice}" />
 				</p:column>
 			</p:dataTable>
@@ -235,19 +310,37 @@
 								</p:link>
 
 								<p:outputLabel value="#{msg.ASSIGNED_CONTACT_PERSON_HEADER}" title="#{msg.ASSIGNED_CONTACT_PERSON_TO_BRANCH_OFFICE_TITLE}" />
-								<p:link outcome="admin_show_employee" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchContactEmployee)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchContactEmployee}">
+								<p:link
+									outcome="admin_show_employee"
+									target="_blank"
+									value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchContactEmployee)}"
+									title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}"
+									rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchContactEmployee}"
+									>
 									<f:param name="employeeId" value="#{branchOfficeListController.selectedBranchOffice.branchContactEmployee.employeeId}" />
 								</p:link>
 								<h:outputText value="#{msg.NO_CONTACT_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchContactEmployee}" />
 
 								<p:outputLabel value="#{msg.ASSIGNED_OWNER_EMPLOYEE_HEADER}" title="#{msg.ASSIGNED_OWNER_EMPLOYEE_TO_BRANCH_OFFICE_TITLE}" />
-								<p:link outcome="admin_show_employee" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_EMPLOYEE_TITLE}" value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchOwnerEmployee)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchOwnerEmployee}">
+								<p:link
+									outcome="admin_show_employee"
+									target="_blank"
+									value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchOwnerEmployee)}"
+									title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_EMPLOYEE_TITLE}"
+									rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchOwnerEmployee}"
+									>
 									<f:param name="employeeId" value="#{branchOfficeListController.selectedBranchOffice.branchContactEmployee.employeeId}" />
 								</p:link>
 								<h:outputText value="#{msg.NO_OWNER_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchOwnerEmployee}" />
 
 								<p:outputLabel value="#{msg.ASSIGNED_USER_OWNER_HEADER}" title="#{msg.ASSIGNED_USER_OWNER_TO_BRANCH_OFFICE_TITLE}" />
-								<p:link outcome="admin_show_user" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(branchOfficeListController.selectedBranchOffice.branchUserOwner)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchUserOwner}">
+								<p:link
+									outcome="admin_show_user"
+									target="_blank"
+									value="#{beanHelper.renderUser(branchOfficeListController.selectedBranchOffice.branchUserOwner)}"
+									title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}"
+									rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchUserOwner}"
+									>
 									<f:param name="userId" value="#{branchOfficeListController.selectedBranchOffice.branchUserOwner.userId}" />
 								</p:link>
 								<h:outputText value="#{msg.NO_USER_ASSIGNED_AS_OWNER_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchUserOwner}" />
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 9cae3468..9f308c59 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -28,12 +28,18 @@
 				emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT}"
 				summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}"
 				>
-				<p:column exportable="false">
+				<p:column
+					exportable="false"
+					>
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
 					</f:facet>
 
-					<p:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+					<p:link
+						outcome="admin_show_contact"
+						value="#{contact.contactId}"
+						title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+						>
 						<f:param name="contactId" value="#{contact.contactId}" />
 					</p:link>
 				</p:column>
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 648aadc6..eec56139 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -35,7 +35,11 @@
 						<h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
 					</f:facet>
 
-					<p:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+					<p:link
+						outcome="admin_show_contact"
+						value="#{contact.contactId}"
+						title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+						>
 						<f:param name="contactId" value="#{contact.contactId}" />
 					</p:link>
 				</p:column>
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index e1d307dc..6f6b2402 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -45,7 +45,11 @@
 				</div>
 
 				<div class="para">
-					<p:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+					<p:link
+						outcome="admin_show_contact"
+						value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}"
+						title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+						>
 						<f:param name="contactId" value="#{adminContactPhoneController.contact.contactId}" />
 					</p:link>
 				</div>
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 1845f997..55026b33 100644
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -40,7 +40,11 @@
 				</div>
 
 				<div class="para">
-					<p:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+					<p:link
+						outcome="admin_show_contact"
+						value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}"
+						title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+						>
 						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
 					</p:link>
 				</div>
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index ed91cacf..aa699eb7 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -40,7 +40,11 @@
 				</div>
 
 				<div class="para">
-					<p:link outcome="admin_show_contact" title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+					<p:link
+						outcome="admin_show_contact"
+						value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}"
+						title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+						>
 						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
 					</p:link>
 				</div>
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 5a97cdf8..e394f038 100644
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -34,7 +34,11 @@
 						<h:outputText value="#{msg.ID_HEADER}" />
 					</f:facet>
 
-					<p:link outcome="admin_show_country" title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}" value="#{country.countryId}">
+					<p:link
+						outcome="admin_show_country"
+						value="#{country.countryId}"
+						title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}"
+						>
 						<f:param name="countryId" value="#{country.countryId}" />
 					</p:link>
 				</p:column>
diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index f9df8cc0..a52836bc 100644
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -53,17 +53,35 @@
 					</p:panelGrid>
 				</f:facet>
 
-				<p:column headerText="#{msg.ID_HEADER}" sortBy="#{department.departmentId}" filterable="false">
-					<p:link outcome="admin_show_department" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}" value="#{department.departmentId}">
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{department.departmentId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_department"
+						value="#{department.departmentId}"
+						title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}"
+						>
 						<f:param name="departmentId" value="#{department.departmentId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_I18N_KEY_HEADER}" sortBy="#{local[department.departmentI18nKey]}" filterBy="#{local[department.departmentI18nKey]}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.ADMIN_I18N_KEY_HEADER}"
+					sortBy="#{local[department.departmentI18nKey]}"
+					filterBy="#{local[department.departmentI18nKey]}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{local[department.departmentI18nKey]}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{department.departmentCompany}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}"
+					sortBy="#{department.departmentCompany}"
+					filterBy="#{department.departmentCompany}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -93,7 +111,12 @@
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{department.departmentBranchOffice}" filterBy="#{department.departmentBranchOffice}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_BRANCH_OFFICE_HEADER}"
+					sortBy="#{department.departmentBranchOffice}"
+					filterBy="#{department.departmentBranchOffice}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -114,16 +137,31 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{beanHelper.renderBranchOffice(department.departmentBranchOffice)}" rendered="#{not empty department.departmentBranchOffice}">
+					<p:link
+						outcome="admin_show_branch_office"
+						value="#{beanHelper.renderBranchOffice(department.departmentBranchOffice)}"
+						title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
+						rendered="#{not empty department.departmentBranchOffice}"
+						>
 						<f:param name="branchId" value="#{department.departmentBranchOffice.branchId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_department_branch_office" title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENT_BRANCH_OFFICE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty department.departmentBranchOffice}">
+					<p:link
+						outcome="admin_assign_department_branch_office"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENT_BRANCH_OFFICE_TITLE}"
+						rendered="#{empty department.departmentBranchOffice}"
+						>
 						<f:param name="departmentId" value="#{department.departmentId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_DEPARTMENT_LEAD_EMPLOYEE}" sortBy="#{department.departmentLead.employeePersonalData.contactFamilyName}" filterBy="#{department.departmentLead}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_DEPARTMENT_LEAD_EMPLOYEE}"
+					sortBy="#{department.departmentLead.employeePersonalData.contactFamilyName}"
+					filterBy="#{department.departmentLead}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -144,16 +182,31 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_LEAD_EMPLOYEE_TITLE}" value="#{department.departmentLead.employeeId}" rendered="#{not empty department.departmentLead}">
+					<p:link
+						outcome="admin_show_employee"
+						value="#{department.departmentLead.employeeId}"
+						title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_LEAD_EMPLOYEE_TITLE}"
+						rendered="#{not empty department.departmentLead}"
+						>
 						<f:param name="employeeId" value="#{department.departmentLead.employeeId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_department_employee" title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENTS_LEAD_EMPLOYEE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty department.departmentLead}">
+					<p:link
+						outcome="admin_assign_department_employee"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENTS_LEAD_EMPLOYEE_TITLE}"
+						rendered="#{empty department.departmentLead}"
+						>
 						<f:param name="departmentId" value="#{department.departmentId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{department.departmentUserOwner}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_USER_HEADER}"
+					sortBy="#{department.departmentUserOwner}"
+					filterBy="#{department.departmentUserOwner}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -174,22 +227,40 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_OWNER_USER_TITLE}" value="#{department.departmentUserOwner.userId}" rendered="#{not empty department.departmentUserOwner}">
+					<p:link
+						outcome="admin_show_user"
+						value="#{department.departmentUserOwner.userId}"
+						title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_OWNER_USER_TITLE}"
+						rendered="#{not empty department.departmentUserOwner}"
+						>
 						<f:param name="userId" value="#{department.departmentUserOwner.userId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_department_user" title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENTS_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty department.departmentUserOwner}">
+					<p:link
+						outcome="admin_assign_department_user"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENTS_OWNER_USER_TITLE}"
+						rendered="#{empty department.departmentUserOwner}"
+						>
 						<f:param name="departmentId" value="#{department.departmentId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{department.departmentCreated}" filterable="false">
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{department.departmentCreated}"
+					filterable="false"
+					>
 					<h:outputText id="departmentCreated" value="#{department.departmentCreated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
 					<links:outputDepartmentAdminDropdownMenu department="#{department}" />
 				</p:column>
 			</p:dataTable>
diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index 5d16be5f..c3aef03f 100644
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -53,13 +53,36 @@
 					</p:panelGrid>
 				</f:facet>
 
-				<p:column headerText="#{msg.ID_HEADER}" sortBy="#{employee.employeeId}" filterable="false">
-					<p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_EMPLOYEE_TITLE}" value="#{employee.employeeId}">
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{employee.employeeId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_employee"
+						value="#{employee.employeeId}"
+						title="#{msg.ADMIN_LINK_SHOW_EMPLOYEE_TITLE}"
+						>
 						<f:param name="employeeId" value="#{employee.employeeId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{employee.employeeBranchOffice}" filterBy="#{employee.employeeBranchOffice}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.EMPLOYEE_NUMBER_HEADER}"
+					sortBy="#{employee.employeeNumber}"
+					filterBy="#{employee.employeeNumber}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{employee.employeeNumber}" rendered="#{not empty employee.employeeNumber}" />
+					<h:outputText value="-" rendered="#{empty employee.employeeNumber}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_BRANCH_OFFICE_HEADER}"
+					sortBy="#{employee.employeeBranchOffice}"
+					filterBy="#{employee.employeeBranchOffice}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -80,16 +103,31 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{beanHelper.renderBranchOffice(employee.employeeBranchOffice)}" rendered="#{not empty employee.employeeBranchOffice}">
+					<p:link
+						outcome="admin_show_branch_office"
+						value="#{beanHelper.renderBranchOffice(employee.employeeBranchOffice)}"
+						title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
+						rendered="#{not empty employee.employeeBranchOffice}"
+						>
 						<f:param name="branchId" value="#{employee.employeeBranchOffice.branchId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_branch_office" title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEE_BRANCH_OFFICE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty employee.employeeBranchOffice}">
+					<p:link
+						outcome="admin_assign_branch_office"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEE_BRANCH_OFFICE_TITLE}"
+						rendered="#{empty employee.employeeBranchOffice}"
+						>
 						<f:param name="employeeId" value="#{employee.employeeId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{employee.employeeUserOwner}" filterBy="#{employee.employeeUserOwner}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_USER_HEADER}"
+					sortBy="#{employee.employeeUserOwner}"
+					filterBy="#{employee.employeeUserOwner}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -109,16 +147,31 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_EMPLOYEES_OWNER_USER_TITLE}" value="#{employee.employeeUserOwner.userId}" rendered="#{not empty employee.employeeUserOwner}">
+					<p:link
+						outcome="admin_show_user"
+						value="#{employee.employeeUserOwner.userId}"
+						title="#{msg.ADMIN_LINK_SHOW_EMPLOYEES_OWNER_USER_TITLE}"
+						rendered="#{not empty employee.employeeUserOwner}"
+						>
 						<f:param name="userId" value="#{employee.employeeUserOwner.userId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_user_owner" title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty employee.employeeUserOwner}">
+					<p:link
+						outcome="admin_assign_user_owner"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEES_OWNER_USER_TITLE}"
+						rendered="#{empty employee.employeeUserOwner}"
+						>
 						<f:param name="employeeId" value="#{employee.employeeId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{employee.employeeBasicData}" filterBy="#{employee.employeeBasicData}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}"
+					sortBy="#{employee.employeeBasicData}"
+					filterBy="#{employee.employeeBasicData}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -148,19 +201,36 @@
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{employee.employeeEmailAddress}" filterBy="#{employee.employeeEmailAddress}" filterMatchMode="contains">
-					<p:link href="mailto:#{employee.employeeEmailAddress}" value="#{employee.employeeEmailAddress}" rendered="#{not empty employee.employeeEmailAddress}" />
+				<p:column
+					headerText="#{msg.DATA_EMAIL_ADDRESS}"
+					sortBy="#{employee.employeeEmailAddress}"
+					filterBy="#{employee.employeeEmailAddress}"
+					filterMatchMode="contains"
+					>
+					<p:link
+						href="mailto:#{employee.employeeEmailAddress}"
+						value="#{employee.employeeEmailAddress}"
+						rendered="#{not empty employee.employeeEmailAddress}"
+						/>
 
 					<h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty employee.employeeEmailAddress}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{employee.employeeCreated}" filterable="false">
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{employee.employeeCreated}"
+					filterable="false"
+					>
 					<h:outputText id="employeeCreated" value="#{employee.employeeCreated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
 					<links:outputEmployeeAdminDropdownMenu employee="#{employee}" />
 				</p:column>
 			</p:dataTable>
diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index 580844c7..ded37152 100644
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -32,7 +32,11 @@
 					<h:outputText value="#{msg.ID_HEADER}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
+				<p:link
+					outcome="admin_show_fax"
+					value="#{faxNumber.phoneId}"
+					title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}"
+					>
 					<f:param name="phoneId" value="#{faxNumber.phoneId}" />
 				</p:link>
 			</p:column>
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 028f6359..18c9ada8 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -42,7 +42,12 @@
 			<p:column>
 				<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+				<p:link
+					id="contactId"
+					styleClass="table-data-field"
+					outcome="admin_show_contact"
+					value="#{contact.contactId}"
+					>
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</p:link>
 			</p:column>
@@ -74,7 +79,11 @@
 			<p:column>
 				<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+				<p:link
+					id="contactEmailAddress"
+					styleClass="table-data-field"
+					href="mailto:#{contact.contactEmailAddress}"
+					>
 					<h:outputText value="#{contact.contactEmailAddress}" />
 				</h:outputLink>
 			</p:column>
@@ -85,7 +94,9 @@
 				<div class="table-data-field">
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
-							<p:link outcome="admin_unlink_contact_fax">
+							<p:link
+								outcome="admin_unlink_contact_fax"
+								>
 								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index a6528673..bc94fcd9 100644
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -53,13 +53,26 @@
 					</p:panelGrid>
 				</f:facet>
 
-				<p:column headerText="#{msg.ID_HEADER}" sortBy="#{headquarter.headquarterId}" filterable="false">
-					<p:link outcome="admin_show_headquarter" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}" value="#{headquarter.headquarterId}">
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{headquarter.headquarterId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_headquarter"
+						value="#{headquarter.headquarterId}"
+						title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}"
+						>
 						<f:param name="headquarterId" value="#{headquarter.headquarterId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{headquarter.headquarterUserOwner}" filterBy="#{headquarter.headquarterUserOwner}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_USER_HEADER}"
+					sortBy="#{headquarter.headquarterUserOwner}"
+					filterBy="#{headquarter.headquarterUserOwner}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -80,26 +93,55 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_OWNER_USER_TITLE}" value="#{headquarter.headquarterUserOwner.userId}" rendered="#{not empty headquarter.headquarterUserOwner}">
+					<p:link
+						outcome="admin_show_user"
+						value="#{headquarter.headquarterUserOwner.userId}"
+						title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_OWNER_USER_TITLE}"
+						rendered="#{not empty headquarter.headquarterUserOwner}"
+						>
 						<f:param name="userId" value="#{headquarter.headquarterUserOwner.userId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_headquarter_owner" title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty headquarter.headquarterUserOwner}">
+					<p:link
+						outcome="admin_assign_headquarter_owner"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_OWNER_USER_TITLE}"
+						rendered="#{empty headquarter.headquarterUserOwner}"
+						>
 						<f:param name="headquarterId" value="#{headquarter.headquarterId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{headquarter.headquarterEmailAddress}" filterBy="#{headquarter.headquarterEmailAddress}" filterMatchMode="contains">
-					<p:link href="mailto:#{headquarter.headquarterEmailAddress}" value="#{headquarter.headquarterEmailAddress}" rendered="#{not empty headquarter.headquarterEmailAddress}" />
+				<p:column
+					headerText="#{msg.DATA_EMAIL_ADDRESS}"
+					sortBy="#{headquarter.headquarterEmailAddress}"
+					filterBy="#{headquarter.headquarterEmailAddress}"
+					filterMatchMode="contains"
+					>
+					<p:link
+						href="mailto:#{headquarter.headquarterEmailAddress}"
+						value="#{headquarter.headquarterEmailAddress}"
+						rendered="#{not empty headquarter.headquarterEmailAddress}"
+						/>
 
 					<h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty headquarter.headquarterEmailAddress}" />
 				</p:column>
 
-				<p:column headerText="#{msg.DATA_ADDRESS}" sortBy="#{headquarter.headquarterCity}" filterBy="#{headquarter.headquarterCity}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.DATA_ADDRESS}"
+					sortBy="#{headquarter.headquarterCity}"
+					filterBy="#{headquarter.headquarterCity}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{beanHelper.renderHeadquarter(headquarter)}" title="#{beanHelper.renderHeadquarter(headquarter)}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}" sortBy="#{headquarter.headquarterContactEmployee}" filterBy="#{headquarter.headquarterContactEmployee}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_COMPANY_CONTACT_PERSON_HEADER}"
+					sortBy="#{headquarter.headquarterContactEmployee}"
+					filterBy="#{headquarter.headquarterContactEmployee}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -120,22 +162,40 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(headquarter.headquarterContactEmployee)}" rendered="#{not empty headquarter.headquarterContactEmployee}">
+					<p:link
+						outcome="admin_show_employee"
+						value="#{beanHelper.renderEmployee(headquarter.headquarterContactEmployee)}"
+						title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_CONTACT_PERSON_TITLE}"
+						rendered="#{not empty headquarter.headquarterContactEmployee}"
+						>
 						<f:param name="employeeId" value="#{headquarter.headquarterContactEmployee.employeeId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_headquarter_employee" title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty headquarter.headquarterContactEmployee}">
+					<p:link
+						outcome="admin_assign_headquarter_employee"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_CONTACT_PERSON_TITLE}"
+						rendered="#{empty headquarter.headquarterContactEmployee}"
+						>
 						<f:param name="headquarterId" value="#{headquarter.headquarterId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{headquarter.headquarterCreated}" filterable="false">
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{headquarter.headquarterCreated}"
+					filterable="false"
+					>
 					<h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
 					<links:outputHeadquarterAdminDropdownMenu headquarter="#{headquarter}" />
 				</p:column>
 			</p:dataTable>
@@ -192,21 +252,29 @@
 						<h:outputText value="#{msg.ADMIN_LIST_HEADQUARTER_OPENING_TIMES_HEADER}" />
 					</f:facet>
 
-					<p:column headerText="#{msg.ADMIN_START_WEEK_DAY}">
+					<p:column
+						headerText="#{msg.ADMIN_START_WEEK_DAY}"
+						>
 						<h:outputText value="#{openingTime.openingStartDay.toString()}" />
 					</p:column>
 
-					<p:column headerText="#{msg.ADMIN_END_WEEK_DAY}">
+					<p:column
+						headerText="#{msg.ADMIN_END_WEEK_DAY}"
+						>
 						<h:outputText value="#{openingTime.openingEndDay.toString()}" />
 					</p:column>
 
-					<p:column headerText="#{msg.ADMIN_START_TIME}">
+					<p:column
+						headerText="#{msg.ADMIN_START_TIME}"
+						>
 						<h:outputText value="#{openingTime.openingStartTime}">
 							<f:convertDateTime type="time" timeStyle="short" />
 						</h:outputText>
 					</p:column>
 
-					<p:column headerText="#{msg.ADMIN_END_TIME}">
+					<p:column
+						headerText="#{msg.ADMIN_END_TIME}"
+						>
 						<h:outputText value="#{openingTime.openingEndTime}">
 							<f:convertDateTime type="time" timeStyle="short" />
 						</h:outputText>
diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index 18d517fe..7685a861 100644
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -31,7 +31,11 @@
 					<h:outputText value="#{msg.ID_HEADER}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
+				<p:link
+					outcome="admin_show_landline"
+					value="#{landLineNumber.phoneId}"
+					title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
+					>
 					<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
 				</p:link>
 			</p:column>
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 34704153..fdf288d5 100644
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -42,7 +42,10 @@
 			<p:column>
 				<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<p:link id="contactId" outcome="admin_show_contact">
+				<p:link
+					id="contactId"
+					outcome="admin_show_contact"
+					>
 					<h:outputText styleClass="table-data-field" value="#{contact.contactId}" />
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</p:link>
@@ -75,7 +78,11 @@
 			<p:column>
 				<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+				<p:link
+					id="contactEmailAddress"
+					styleClass="table-data-field"
+					href="mailto:#{contact.contactEmailAddress}"
+					>
 					<h:outputText value="#{contact.contactEmailAddress}" />
 				</h:outputLink>
 			</p:column>
@@ -86,8 +93,10 @@
 				<div class="table-data-field">
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
-							<p:link outcome="admin_unlink_contact_landline">
-								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
+							<p:link
+								outcome="admin_unlink_contact_landline"
+								>
+								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</p:link>
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index 3545df05..db23ca34 100644
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -31,7 +31,11 @@
 					<h:outputText value="#{msg.ID_HEADER}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_mobile" value="#{mobileNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
+				<p:link
+					outcome="admin_show_mobile"
+					value="#{mobileNumber.phoneId}"
+					title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}"
+					>
 					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
 				</p:link>
 			</p:column>
@@ -41,7 +45,11 @@
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_mobile_provider" value="#{mobileNumber.mobileProvider.providerName}">
+				<p:link
+					outcome="admin_show_mobile_provider"
+					value="#{mobileNumber.mobileProvider.providerName}"
+					title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}"
+					>
 					<f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
 				</p:link>
 			</p:column>
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index a17d75fe..e4e4068e 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -42,7 +42,12 @@
 			<p:column>
 				<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+				<p:link
+					id="contactId"
+					styleClass="table-data-field"
+					outcome="admin_show_contact"
+					value="#{contact.contactId}"
+					>
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</p:link>
 			</p:column>
@@ -74,7 +79,11 @@
 			<p:column>
 				<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+				<p:link
+					id="contactEmailAddress"
+					styleClass="table-data-field"
+					href="mailto:#{contact.contactEmailAddress}"
+					>
 					<h:outputText value="#{contact.contactEmailAddress}" />
 				</h:outputLink>
 			</p:column>
@@ -85,7 +94,9 @@
 				<div class="table-data-field">
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
-							<p:link outcome="admin_unlink_contact_mobile">
+							<p:link
+								outcome="admin_unlink_contact_mobile"
+								>
 								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index b4ab0f20..444cbce9 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -51,21 +51,44 @@
 					</p:panelGrid>
 				</f:facet>
 
-				<p:column headerText="#{msg.ID_HEADER}" sortBy="#{mobileProvider.providerId}" filterBy="#{mobileProvider.providerId}">
-					<p:link outcome="admin_show_mobile_provider" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}" value="#{mobileProvider.providerId}">
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{mobileProvider.providerId}"
+					filterBy="#{mobileProvider.providerId}"
+					>
+					<p:link
+						outcome="admin_show_mobile_provider"
+						value="#{mobileProvider.providerId}"
+						title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}"
+						>
 						<f:param name="providerId" value="#{mobileProvider.providerId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}" sortBy="#{mobileProvider.providerName}" filterBy="#{mobileProvider.providerName}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}"
+					sortBy="#{mobileProvider.providerName}"
+					filterBy="#{mobileProvider.providerName}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{mobileProvider.providerName}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}" sortBy="#{mobileProvider.providerDialPrefix}" filterBy="#{mobileProvider.providerDialPrefix}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}"
+					sortBy="#{mobileProvider.providerDialPrefix}"
+					filterBy="#{mobileProvider.providerDialPrefix}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{mobileProvider.providerDialPrefix}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" sortBy="#{mobileProvider.providerCountry.countryPhoneCode}" filterBy="#{mobileProvider.providerCountry}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}"
+					sortBy="#{mobileProvider.providerCountry.countryPhoneCode}"
+					filterBy="#{mobileProvider.providerCountry}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -88,13 +111,19 @@
 					<h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{mobileProvider.providerEntryCreated}">
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{mobileProvider.providerEntryCreated}"
+					>
 					<h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false">
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					>
 					<links:outputMobileProviderAdminDropdownMenu mobileProvider="#{mobileProvider}" />
 				</p:column>
 			</p:dataTable>
diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/opening_time/admin_opening_time_list.xhtml
index 85619b94..2e88e35c 100644
--- a/web/admin/opening_time/admin_opening_time_list.xhtml
+++ b/web/admin/opening_time/admin_opening_time_list.xhtml
@@ -53,13 +53,26 @@
 					</p:panelGrid>
 				</f:facet>
 
-				<p:column headerText="#{msg.ID_HEADER}" sortBy="#{openingTime.openingId}" filterable="false">
-					<p:link outcome="admin_show_opening_time" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}" value="#{openingTime.openingId}">
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{openingTime.openingId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_opening_time"
+						value="#{openingTime.openingId}"
+						title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}"
+						>
 						<f:param name="openingId" value="#{openingTime.openingId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_START_WEEK_DAY}" sortBy="#{openingTime.openingStartDay}" filterBy="#{openingTime.openingStartDay}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_START_WEEK_DAY}"
+					sortBy="#{openingTime.openingStartDay}"
+					filterBy="#{openingTime.openingStartDay}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							label="#{msg.LABEL_WEEK_DAYS}"
@@ -81,7 +94,12 @@
 					<h:outputText value="#{openingTime.openingStartDay.toString()}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_END_WEEK_DAY}" sortBy="#{openingTime.openingEndDay}" filterBy="#{openingTime.openingEndDay}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_END_WEEK_DAY}"
+					sortBy="#{openingTime.openingEndDay}"
+					filterBy="#{openingTime.openingEndDay}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							label="#{msg.LABEL_WEEK_DAYS}"
@@ -103,19 +121,33 @@
 					<h:outputText value="#{openingTime.openingEndDay.toString()}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_START_TIME}" sortBy="#{openingTime.openingStartTime}" filterBy="#{openingTime.openingStartTime}" filterable="false">
+				<p:column
+					headerText="#{msg.ADMIN_START_TIME}"
+					sortBy="#{openingTime.openingStartTime}"
+					filterBy="#{openingTime.openingStartTime}"
+					filterable="false"
+					>
 					<h:outputText value="#{openingTime.openingStartTime}">
 						<f:convertDateTime type="time" timeStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_END_TIME}" sortBy="#{openingTime.openingEndTime}" filterBy="#{openingTime.openingEndTime}" filterable="false">
+				<p:column
+					headerText="#{msg.ADMIN_END_TIME}"
+					sortBy="#{openingTime.openingEndTime}"
+					filterBy="#{openingTime.openingEndTime}"
+					filterable="false"
+					>
 					<h:outputText value="#{openingTime.openingEndTime}">
 						<f:convertDateTime type="time" timeStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
 					<links:outputOpeningTimeAdminDropdownMenu openingTime="#{openingTime}" />
 				</p:column>
 			</p:dataTable>
diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 6291832e..09745ae4 100644
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -41,7 +41,11 @@
 					<h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
+				<p:link
+					outcome="admin_show_user"
+					value="#{userActivity.activityUser.userId}"
+					title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+					>
 					<f:param name="userId" value="#{userActivity.activityUser.userId}" />
 				</p:link>
 			</p:column>
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index a673634b..3de869dd 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -33,7 +33,11 @@
 						<h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
 					</f:facet>
 
-					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+					<p:link
+						outcome="admin_show_user"
+						value="#{user.userId}"
+						title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 				</p:column>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 41ec650e..eeda9a55 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -52,17 +52,37 @@
 					</p:panelGrid>
 				</f:facet>
 
-				<p:column headerText="#{msg.ADMIN_USER_ID}" sortBy="#{user.userId}" filterBy="#{user.userId}" filterMatchMode="contains">
-					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+				<p:column
+					headerText="#{msg.ADMIN_USER_ID}"
+					sortBy="#{user.userId}"
+					filterBy="#{user.userId}"
+					filterMatchMode="contains"
+					>
+					<p:link
+						outcome="admin_show_user"
+						value="#{user.userId}"
+						title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_LIST_USER_NAME}" sortBy="#{user.userName}" filterBy="#{user.userName}" filterMatchMode="contains" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+				<p:column
+					headerText="#{msg.ADMIN_LIST_USER_NAME}"
+					sortBy="#{user.userName}"
+					filterBy="#{user.userName}"
+					filterMatchMode="contains"
+					rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}"
+					>
 					<h:outputText value="#{user.userName}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" sortBy="#{user.userContact.contactPersonalTitle}" filterBy="#{user.userContact.contactPersonalTitle}" filterMatchMode="exact">
+				<p:column
+					headerText="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}"
+					sortBy="#{user.userContact.contactPersonalTitle}"
+					filterBy="#{user.userContact.contactPersonalTitle}"
+					filterMatchMode="exact"
+					>
 					<f:facet name="filter">
 						<p:selectOneMenu
 							filter="true"
@@ -84,15 +104,30 @@
 					<h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_CONTACT_FIRST_NAME}" sortBy="#{user.userContact.contactFirstName}" filterBy="#{user.userContact.contactFirstName}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.ADMIN_CONTACT_FIRST_NAME}"
+					sortBy="#{user.userContact.contactFirstName}"
+					filterBy="#{user.userContact.contactFirstName}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{user.userContact.contactFirstName}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_CONTACT_FAMILY_NAME}" sortBy="#{user.userContact.contactFamilyName}" filterBy="#{user.userContact.contactFamilyName}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.ADMIN_CONTACT_FAMILY_NAME}"
+					sortBy="#{user.userContact.contactFamilyName}"
+					filterBy="#{user.userContact.contactFamilyName}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{user.userContact.contactFamilyName}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_USER_ACCOUNT_STATUS}" sortBy="#{user.userAccountStatus}" filterBy="#{user.userAccountStatus}" filterMatchMode="exact">
+				<p:column
+					headerText="#{msg.ADMIN_USER_ACCOUNT_STATUS}"
+					sortBy="#{user.userAccountStatus}"
+					filterBy="#{user.userAccountStatus}"
+					filterMatchMode="exact"
+					>
 					<f:facet name="filter">
 						<p:selectOneMenu
 							filter="true"
@@ -114,7 +149,12 @@
 					<h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_USER_PROFILE_MODE}" sortBy="#{user.userProfileMode}" filterBy="#{user.userProfileMode}" filterMatchMode="exact">
+				<p:column
+					headerText="#{msg.ADMIN_USER_PROFILE_MODE}"
+					sortBy="#{user.userProfileMode}"
+					filterBy="#{user.userProfileMode}"
+					filterMatchMode="exact"
+					>
 					<f:facet name="filter">
 						<p:selectOneMenu
 							filter="true"
@@ -136,13 +176,21 @@
 					<h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{user.userCreated}" filterable="false">
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{user.userCreated}"
+					filterable="false"
+					>
 					<h:outputText id="userCreated" value="#{user.userCreated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
 					<links:outputUserAdminDropdownMenu user="#{user}" />
 				</p:column>
 			</p:dataTable>
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 7ca8a10f..3cee469f 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -42,7 +42,11 @@
 					</div>
 
 					<div class="table-data-field">
-						<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+						<p:link
+							outcome="admin_show_user"
+							title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+							value="#{beanHelper.user.userId}"
+							>
 							<f:param name="userId" value="#{beanHelper.user.userId}" />
 						</p:link>
 					</div>
diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index e8a391fa..e954485e 100644
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -25,7 +25,11 @@
 
 				<h:outputText value="&#160;" />
 
-				<p:link id="user_register" outcome="user_register" title="#{msg.GUEST_LINK_USER_NO_ACCOUNT_TITLE}" value="#{msg.GUEST_LINK_USER_NO_ACCOUNT_YET}" />
+				<p:link
+					outcome="user_register"
+					value="#{msg.GUEST_LINK_USER_NO_ACCOUNT_YET}"
+					title="#{msg.GUEST_LINK_USER_NO_ACCOUNT_TITLE}"
+					/>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="para" layout="block">
@@ -33,7 +37,11 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
-				<p:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.GUEST_LINK_USER_LOST_PASSWORD}" />
+				<p:link
+					outcome="user_lost_password"
+					value="#{msg.GUEST_LINK_USER_LOST_PASSWORD}"
+					title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}"
+					/>
 			</h:panelGroup>
 		</ui:fragment>
 	</ui:define>
diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index c3b1dc15..1da89b76 100644
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -25,7 +25,10 @@
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 				<h:panelGroup styleClass="para" layout="block">
 					<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} " />
-					<p:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+					<p:link
+						outcome="user_login"
+						value="#{msg.CLICK_HERE}"
+						/>
 					<h:outputText value=" #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
 				</h:panelGroup>
 			</ui:fragment>
diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml
index 8e764edc..fa04cf53 100644
--- a/web/guest/user/user_register_done.xhtml
+++ b/web/guest/user/user_register_done.xhtml
@@ -22,7 +22,12 @@
 		</h:panelGroup>
 
 		<h:panelGroup layout="block" styleClass="registration_form">
-			<p:link id="resend_link" styleClass="resend_link" value="#{msg.GUEST_LINK_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+			<p:link
+				outcome="user_resend_link"
+				value="#{msg.GUEST_LINK_RESEND_CONFIRMATION_LINK}"
+				rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}"
+				styleClass="resend_link"
+				/>
 		</h:panelGroup>
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index 73b3abe9..32e1901b 100644
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -23,7 +23,10 @@
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 				<h:panelGroup styleClass="para" layout="block">
 					<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
-					<p:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+					<p:link
+						outcome="user_login"
+						value="#{msg.CLICK_HERE}"
+						/>
 					<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
 				</h:panelGroup>
 			</ui:fragment>
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index cdfdb608..354e7a2e 100644
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -22,7 +22,10 @@
 		<core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
 		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+			<p:link
+				outcome="user_change_password"
+				value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+				/>
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 5620a3b4..1686bedd 100644
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -30,18 +30,30 @@
 				<ul>
 					<ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
 						<li>
-							<p:link title="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA}" />
+							<p:link
+								outcome="login_user_change_personal_data"
+								value="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA}"
+								title="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA_TITLE}"
+								/>
 						</li>
 					</ui:fragment>
 
 					<ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
 						<li>
-							<p:link title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}" />
+							<p:link
+								outcome="login_user_change_email_address"
+								value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}"
+								title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}"
+								/>
 						</li>
 					</ui:fragment>
 
 					<li>
-						<p:link title="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD}" />
+						<p:link
+							outcome="login_user_change_password"
+							value="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD}"
+							title="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD_TITLE}"
+							/>
 					</li>
 				</ul>
 			</h:panelGroup>
diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
index 8d6cac9e..76e5055e 100644
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -20,9 +20,11 @@
 			<!-- @TODO Here goes your content. //-->
 		</ui:fragment>
 
-		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-		</ui:fragment>
+		<p:link
+			outcome="user_change_password"
+			value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+			rendered="#{userLoginController.ifUserMustChangePassword()}"
+			/>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
index 6eff3bdb..27f83c81 100644
--- a/web/user/login_user_change_personal_data.xhtml
+++ b/web/user/login_user_change_personal_data.xhtml
@@ -19,9 +19,11 @@
 	<ui:define name="content">
 		<core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
-		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-		</ui:fragment>
+		<p:link
+			outcome="user_change_password"
+			value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+			rendered="#{userLoginController.ifUserMustChangePassword()}"
+			/>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml
index 0e5da1fd..b19c5b92 100644
--- a/web/user/login_user_contact_data_saved.xhtml
+++ b/web/user/login_user_contact_data_saved.xhtml
@@ -21,7 +21,11 @@
 
 		<core:outputMessageBox panelGroupId="errorUserEditDataDisabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
-		<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" rendered="#{userLoginController.ifUserMustChangePassword()}" />
+		<p:link
+			outcome="user_change_password"
+			value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+			rendered="#{userLoginController.ifUserMustChangePassword()}"
+			/>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index 36537211..4c0b9e1d 100644
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -19,9 +19,11 @@
 	<ui:define name="content">
 		<core:outputMessageBox panelGroupId="loginUserDataSaved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
-		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-		</ui:fragment>
+		<p:link
+			outcome="user_change_password"
+			value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+			rendered="#{userLoginController.ifUserMustChangePassword()}"
+			/>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />