From 7e53e0ca700af5394f199322a51cc957b3557081 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 24 Nov 2018 17:22:01 +0100
Subject: [PATCH] Please cherry-pick: - splitted f:selectItems' attributes into
 multiple lines having in each a   separate attribute for easy adding
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../mobile/admin_form_mobile_data.tpl         |  9 ++-
 .../form_data/user/admin_form_user_data.tpl   |  9 ++-
 .../form_data/form_country_selector.tpl       |  9 ++-
 .../personal_title_selection_box.tpl          |  8 ++-
 .../user_profile_mode_table_row.tpl           |  9 ++-
 .../basic_data/admin_form_basic_data.tpl      | 40 +++++++++++--
 .../admin_form_branch_office_data.tpl         | 40 +++++++++++--
 .../admin_form_branch_opening_time.tpl        | 20 ++++++-
 .../department/admin_form_department_data.tpl | 49 +++++++++++++--
 .../employee/admin_form_employee_data.tpl     | 60 +++++++++++++++++--
 .../admin/fax/admin_form_add_contact_fax.tpl  |  9 ++-
 .../headquarter/admin_form_headquarter.tpl    | 20 ++++++-
 .../admin_form_headquarter_opening_time.tpl   | 20 ++++++-
 .../admin_form_add_contact_landline.tpl       |  9 ++-
 .../mobile/admin_form_add_contact_mobile.tpl  |  9 ++-
 .../opening_time/admin_form_opening_time.tpl  | 20 ++++++-
 .../widgets/locale_change_widget.tpl          |  9 ++-
 .../basic_data/admin_basic_data_list.xhtml    | 24 +++++++-
 .../admin_branch_office_list.xhtml            | 24 +++++++-
 .../department/admin_department_list.xhtml    | 32 ++++++++--
 web/admin/employee/admin_employee_list.xhtml  | 24 +++++++-
 .../headquarter/admin_headquarter_list.xhtml  | 16 ++++-
 .../admin_opening_time_list.xhtml             | 16 ++++-
 web/admin/user/admin_user_list.xhtml          |  8 ++-
 24 files changed, 439 insertions(+), 54 deletions(-)

diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
index 08f09b27..9bffd379 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
@@ -36,8 +36,15 @@
 					requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}"
 					>
 					<f:converter converterId="MobileProviderConverter" />
+
 					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-					<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+
+					<f:selectItems
+						value="#{mobileProviderController.allMobileProviders()}"
+						var="mobileProvider"
+						itemValue="#{mobileProvider}"
+						itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})"
+						/>
 				</p:selectOneMenu>
 			</h:panelGroup>
 
diff --git a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
index 622f045d..c551f289 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
@@ -37,8 +37,15 @@
 					filter="true"
 					filterMatchMode="contains"
 					>
+
 					<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-					<f:selectItems value="#{dataController.profileModes}" var="profileMode" itemValue="#{profileMode}" itemLabel="#{msg[profileMode.messageKey]}" />
+
+					<f:selectItems
+						value="#{dataController.profileModes}"
+						var="profileMode"
+						itemValue="#{profileMode}"
+						itemLabel="#{msg[profileMode.messageKey]}"
+						/>
 				</p:selectOneMenu>
 			</p:panelGrid>
 		</p:fieldset>
diff --git a/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
index 37dd1926..b3369930 100644
--- a/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
+++ b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
@@ -17,7 +17,14 @@
 		requiredMessage="#{requiredMessage}"
 		>
 		<f:converter converterId="CountryConverter" />
+
 		<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" rendered="#{empty allowNull or allowNull}" />
-		<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
+
+		<f:selectItems
+			value="#{countryController.allCountries()}"
+			var="country"
+			itemValue="#{country}"
+			itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})"
+			/>
 	</p:selectOneMenu>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl b/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl
index b8a30535..8731f8cc 100644
--- a/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl
+++ b/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl
@@ -13,6 +13,12 @@
 		requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}"
 		rendered="#{empty rendered or rendered == true}"
 		>
-		<f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
+
+		<f:selectItems
+			value="#{genderController.selectableGenders}"
+			var="personalTitle"
+			itemValue="#{personalTitle}"
+			itemLabel="#{msg[personalTitle.messageKey]}"
+			/>
 	</p:selectOneRadio>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
index 4284af9f..7f6432bc 100644
--- a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
@@ -15,8 +15,15 @@
 			filter="true"
 			filterMatchMode="contains"
 			>
+
 			<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-			<f:selectItems value="#{dataController.profileModes}" var="profileMode" itemValue="#{profileMode}" itemLabel="#{msg[profileMode.messageKey]}" />
+
+			<f:selectItems
+				value="#{dataController.profileModes}"
+				var="profileMode"
+				itemValue="#{profileMode}"
+				itemLabel="#{msg[profileMode.messageKey]}"
+				/>
 		</p:selectOneMenu>
 
 		<p:message for="personalTitle" />
diff --git a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
index 3f676b71..e5992c7c 100644
--- a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
+++ b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
@@ -55,9 +55,17 @@
 					filter="true"
 					filterMatchMode="contains"
 					>
+
 					<f:converter converterId="UserConverter" />
+
 					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-					<f:selectItems value="#{userController.allUsers()}" var="companyUserOwner" itemValue="#{companyUserOwner}" itemLabel="#{companyUserOwner.userContact.contactFirstName} #{companyUserOwner.userContact.contactFamilyName} (#{companyUserOwner.userName})" />
+
+					<f:selectItems
+						value="#{userController.allUsers()}"
+						var="companyUserOwner"
+						itemValue="#{companyUserOwner}"
+						itemLabel="#{beanHelper.renderContact(companyUserOwner.userContact)} (#{companyUserOwner.userName})"
+						/>
 				</p:selectOneMenu>
 
 				<p:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_CONTACT_EMPLOYEE}" />
@@ -67,9 +75,17 @@
 					filter="true"
 					filterMatchMode="contains"
 					>
+
 					<f:converter converterId="EmployeeConverter" />
+
 					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-					<f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+					<f:selectItems
+						value="#{employeeController.allEmployees()}"
+						var="companyEmployee"
+						itemValue="#{companyEmployee}"
+						itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+						/>
 				</p:selectOneMenu>
 
 				<p:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_FOUNDER}" />
@@ -79,9 +95,17 @@
 					filter="true"
 					filterMatchMode="contains"
 					>
+
 					<f:converter converterId="EmployeeConverter" />
+
 					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-					<f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+					<f:selectItems
+						value="#{employeeController.allEmployees()}"
+						var="companyEmployee"
+						itemValue="#{companyEmployee}"
+						itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+						/>
 				</p:selectOneMenu>
 
 				<p:outputLabel for="companyHeadquarter" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_HEADQUARTER}" />
@@ -91,9 +115,17 @@
 					filter="true"
 					filterMatchMode="contains"
 					>
+
 					<f:converter converterId="HeadquarterConverter" />
+
 					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-					<f:selectItems value="#{headquarterController.allHeadquarter()}" var="headquarter" itemValue="#{headquarter}" itemLabel="#{beanHelper.renderHeadquarter(headquarter)}" />
+
+					<f:selectItems
+						value="#{headquarterController.allHeadquarter()}"
+						var="headquarter"
+						itemValue="#{headquarter}"
+						itemLabel="#{beanHelper.renderHeadquarter(headquarter)}"
+						/>
 				</p:selectOneMenu>
 
 				<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_BASIC_DATA_PHONE_NUMBER}" />
diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
index 08744712..90a88a8d 100644
--- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
@@ -27,9 +27,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}"
 				>
+
 				<f:converter converterId="BasicCompanyDataConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+				<f:selectItems
+					value="#{basicDataListController.allBasicData}"
+					var="basicData"
+					itemValue="#{basicData}"
+					itemLabel="#{beanHelper.renderBasicData(basicData)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
@@ -39,9 +47,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="EmployeeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+				<f:selectItems
+					value="#{employeeController.allEmployees()}"
+					var="companyEmployee"
+					itemValue="#{companyEmployee}"
+					itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="branchOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_OWNER}" />
@@ -51,9 +67,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="EmployeeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+				<f:selectItems
+					value="#{employeeController.allEmployees()}"
+					var="companyEmployee"
+					itemValue="#{companyEmployee}"
+					itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER}" />
@@ -63,9 +87,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="UserConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
+
+				<f:selectItems
+					value="#{userController.allUsers()}"
+					var="branchUserOwner"
+					itemValue="#{branchUserOwner}"
+					itemLabel="#{beanHelper.renderContact(branchUserOwner.userContact)} (#{branchUserOwner.userName})"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl
index a88861b0..6c54ce6c 100644
--- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl
@@ -28,9 +28,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
 				>
+
 				<f:converter converterId="DayOfTheWeekConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+				<f:selectItems
+					value="#{dataController.dayOfTheWeek}"
+					var="dayOfWeek"
+					itemValue="#{dayOfWeek}"
+					itemLabel="#{dayOfWeek.toString()}"
+					/>
 			</p:selectOneMenu>
 
 			<p:selectOneMenu
@@ -41,9 +49,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
 				>
+
 				<f:converter converterId="DayOfTheWeekConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+				<f:selectItems
+					value="#{dataController.dayOfTheWeek}"
+					var="dayOfWeek"
+					itemValue="#{dayOfWeek}"
+					itemLabel="#{dayOfWeek.toString()}"
+					/>
 			</p:selectOneMenu>
 
 			<p:calendar
diff --git a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
index a1b6e8b9..42747902 100644
--- a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
+++ b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
@@ -34,9 +34,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_DEPARTMENT_COMPANY_REQUIRED}"
 				>
+
 				<f:converter converterId="BasicCompanyDataConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+				<f:selectItems
+					value="#{basicDataListController.allBasicData}"
+					var="basicData"
+					itemValue="#{basicData}"
+					itemLabel="#{beanHelper.renderBasicData(basicData)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="departmentBranchOffice" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_BRANCH_OFFICE}" />
@@ -47,8 +55,15 @@
 				filterMatchMode="contains"
 				>
 				<f:converter converterId="BranchOfficeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+
+				<f:selectItems
+					value="#{branchOfficeListController.allBranchOffices()}"
+					var="branchOffice"
+					itemValue="#{branchOffice}"
+					itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="departmentHeadquarter" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_HEADQUARTER}" />
@@ -58,9 +73,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="HeadquarterConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{headquarterController.allHeadquarter()}" var="headquarter" itemValue="#{headquarter}" itemLabel="#{beanHelper.renderHeadquarter(headquarter)}" />
+
+				<f:selectItems
+					value="#{headquarterController.allHeadquarter()}"
+					var="headquarter"
+					itemValue="#{headquarter}"
+					itemLabel="#{beanHelper.renderHeadquarter(headquarter)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="departmentLead" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_LEAD_EMPLOYEE}" />
@@ -70,9 +93,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="EmployeeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+				<f:selectItems
+					value="#{employeeController.allEmployees()}"
+					var="employee"
+					itemValue="#{employee}"
+					itemLabel="#{beanHelper.renderEmployee(employee)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="departmentUserOwner" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_USER_OWNER}" />
@@ -82,9 +113,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="UserConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{userController.allUsers()}" var="departmentUserOwner" itemValue="#{departmentUserOwner}" itemLabel="#{departmentUserOwner.userContact.contactFirstName} #{departmentUserOwner.userContact.contactFamilyName} (#{departmentUserOwner.userName})" />
+
+				<f:selectItems
+					value="#{userController.allUsers()}"
+					var="departmentUserOwner"
+					itemValue="#{departmentUserOwner}"
+					itemLabel="#{beanHelper.renderContact(departmentUserOwner.userContact)} (#{departmentUserOwner.userName})"
+					/>
 			</p:selectOneMenu>
 		</p:panelGrid>
 	</p:fieldset>
diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
index 86034372..290b73ff 100644
--- a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
+++ b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
@@ -27,9 +27,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_EMPLOYEE_COMPANY_REQUIRED}"
 				>
+
 				<f:converter converterId="BasicCompanyDataConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+				<f:selectItems
+					value="#{basicDataListController.allBasicData}"
+					var="basicData"
+					itemValue="#{basicData}"
+					itemLabel="#{basicData.companyName}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="employeeBranchOffice" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_BRANCH_OFFICE}" />
@@ -39,9 +47,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="BranchOfficeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+
+				<f:selectItems
+					value="#{branchOfficeListController.allBranchOffices()}"
+					var="branchOffice"
+					itemValue="#{branchOffice}"
+					itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="employeePersonalData" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_PERSONAL_DATA}" />
@@ -51,9 +67,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="ContactConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{contactController.allContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{beanHelper.renderContact(contact)}" />
+
+				<f:selectItems
+					value="#{contactController.allContacts()}"
+					var="contact"
+					itemValue="#{contact}"
+					itemLabel="#{beanHelper.renderContact(contact)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="employeeUserOwner" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_USER_OWNER}" />
@@ -63,9 +87,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="UserConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{userController.allUsers()}" var="employeeUserOwner" itemValue="#{employeeUserOwner}" itemLabel="#{employeeUserOwner.userContact.contactFirstName} #{employeeUserOwner.userContact.contactFamilyName} (#{employeeUserOwner.userName})" />
+
+				<f:selectItems
+					value="#{userController.allUsers()}"
+					var="employeeUserOwner"
+					itemValue="#{employeeUserOwner}"
+					itemLabel="#{beanHelper.renderContact(employeeUserOwner.userContact)} (#{employeeUserOwner.userName})"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="employeeEmailAddress" value="#{msg.ADMIN_ENTER_EMPLOYEE_EMAIL_ADDRESS}" />
@@ -98,9 +130,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="DepartmentConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{departmentController.allDepartments()}" var="department" itemValue="#{department}" itemLabel="#{beanHelper.renderDepartment(department)}" />
+
+				<f:selectItems
+					value="#{departmentController.allDepartments()}"
+					var="department"
+					itemValue="#{department}"
+					itemLabel="#{beanHelper.renderDepartment(department)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="employeeHeadquarter" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_HEADQUARTER}" />
@@ -110,9 +150,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="HeadquarterConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{headquarterController.allHeadquarter()}" var="headquarter" itemValue="#{headquarter}" itemLabel="#{beanHelper.renderHeadquarter(headquarter)}" />
+
+				<f:selectItems
+					value="#{headquarterController.allHeadquarter()}"
+					var="headquarter"
+					itemValue="#{headquarter}"
+					itemLabel="#{beanHelper.renderHeadquarter(headquarter)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_ENTER_EMPLOYEE_MOBILE_NUMBER}" />
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index 4ae25536..d96d9eb3 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -28,8 +28,15 @@
 				<div class="table-right-medium">
 					<p:selectOneMenu styleClass="select" id=" " value="#{adminPhoneController.faxNumber}">
 						<f:converter converterId="FaxNumberConverter" />
+
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+
+						<f:selectItems
+							value="#{adminPhoneController.allNonLinkedFaxNumbers()}"
+							var="faxNumber"
+							itemValue="#{faxNumber}"
+							itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}"
+							/>
 					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
index 8a3091f1..f5920661 100644
--- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
+++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
@@ -38,9 +38,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="EmployeeConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{employeeController.allEmployees()}" var="companyEmployee" itemValue="#{companyEmployee}" itemLabel="#{beanHelper.renderEmployee(companyEmployee)}" />
+
+				<f:selectItems
+					value="#{employeeController.allEmployees()}"
+					var="companyEmployee"
+					itemValue="#{companyEmployee}"
+					itemLabel="#{beanHelper.renderEmployee(companyEmployee)}"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="headquarterUserOwner" value="#{msg.ADMIN_ASSIGN_HEADQUARTER_USER_OWNER}" />
@@ -50,9 +58,17 @@
 				filter="true"
 				filterMatchMode="contains"
 				>
+
 				<f:converter converterId="UserConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-				<f:selectItems value="#{userController.allUsers()}" var="headquarterUserOwner" itemValue="#{headquarterUserOwner}" itemLabel="#{headquarterUserOwner.userContact.contactFirstName} #{headquarterUserOwner.userContact.contactFamilyName} (#{headquarterUserOwner.userName})" />
+
+				<f:selectItems
+					value="#{userController.allUsers()}"
+					var="headquarterUserOwner"
+					itemValue="#{headquarterUserOwner}"
+					itemLabel="#{beanHelper.renderContact(headquarterUserOwner.userContact)} (#{headquarterUserOwner.userName})"
+					/>
 			</p:selectOneMenu>
 
 			<p:outputLabel for="headquarterEmailAddress" value="#{msg.ADMIN_ENTER_HEADQUARTER_EMAIL_ADDRESS}" />
diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl
index 2c688e8b..20479554 100644
--- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl
@@ -29,9 +29,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
 				>
+
 				<f:converter converterId="DayOfTheWeekConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+				<f:selectItems
+					value="#{dataController.dayOfTheWeek}"
+					var="dayOfWeek"
+					itemValue="#{dayOfWeek}"
+					itemLabel="#{dayOfWeek.toString()}"
+					/>
 			</p:selectOneMenu>
 
 			<p:selectOneMenu
@@ -42,9 +50,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
 				>
+
 				<f:converter converterId="DayOfTheWeekConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+				<f:selectItems
+					value="#{dataController.dayOfTheWeek}"
+					var="dayOfWeek"
+					itemValue="#{dayOfWeek}"
+					itemLabel="#{dayOfWeek.toString()}"
+					/>
 			</p:selectOneMenu>
 
 			<p:calendar
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index 41ee57a0..7d8c62ce 100644
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -28,8 +28,15 @@
 				<div class="table-right-medium">
 					<p:selectOneMenu styleClass="select" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
 						<f:converter converterId="LandLineNumberConverter" />
+
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
+
+						<f:selectItems
+							value="#{adminPhoneController.allNonLinkedLandLineNumbers()}"
+							var="landlineNumber"
+							itemValue="#{landlineNumber}"
+							itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}"
+							/>
 					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index a473efa4..19cf2805 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -28,8 +28,15 @@
 				<div class="table-right-medium">
 					<p:selectOneMenu styleClass="select" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
 						<f:converter converterId="MobileNumberConverter" />
+
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{beanHelper.renderMobileNumber(mobileNumber)}" />
+
+						<f:selectItems
+							value="#{adminPhoneController.allNonLinkedMobileNumbers()}"
+							var="mobileNumber"
+							itemValue="#{mobileNumber}"
+							itemLabel="#{beanHelper.renderMobileNumber(mobileNumber)}"
+							/>
 					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
index 02187981..767ee3e0 100644
--- a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
@@ -29,9 +29,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
 				>
+
 				<f:converter converterId="DayOfTheWeekConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+				<f:selectItems
+					value="#{dataController.dayOfTheWeek}"
+					var="dayOfWeek"
+					itemValue="#{dayOfWeek}"
+					itemLabel="#{dayOfWeek.toString()}"
+					/>
 			</p:selectOneMenu>
 
 			<p:selectOneMenu
@@ -42,9 +50,17 @@
 				required="true"
 				requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
 				>
+
 				<f:converter converterId="DayOfTheWeekConverter" />
+
 				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-				<f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+				<f:selectItems
+					value="#{dataController.dayOfTheWeek}"
+					var="dayOfWeek"
+					itemValue="#{dayOfWeek}"
+					itemLabel="#{dayOfWeek.toString()}"
+					/>
 			</p:selectOneMenu>
 
 			<p:calendar
diff --git a/web/WEB-INF/templates/widgets/locale_change_widget.tpl b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
index 20ad9836..c7d57c75 100644
--- a/web/WEB-INF/templates/widgets/locale_change_widget.tpl
+++ b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
@@ -12,8 +12,15 @@
 			<p:outputPanel styleClass="ui-g-12 ui-md-6">
 				<p:selectOneMenu value="#{localizationController.localeCode}">
 					<p:ajax update="master" />
+
 					<f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" itemDisabled="true" />
-					<f:selectItems value="#{localizationController.supportedLocales}" var="locale" itemValue="#{locale}" itemLabel="#{msg[locale.toString().toUpperCase()]}" />
+
+					<f:selectItems
+						value="#{localizationController.supportedLocales}"
+						var="locale"
+						itemValue="#{locale}"
+						itemLabel="#{msg[locale.toString().toUpperCase()]}"
+						/>
 				</p:selectOneMenu>
 			</p:outputPanel>
 
diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml
index 3908532f..34cd3dec 100644
--- a/web/admin/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/basic_data/admin_basic_data_list.xhtml
@@ -104,7 +104,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
 							>
 							<f:converter converterId="EmployeeConverter" />
-							<f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+							<f:selectItems
+								value="#{employeeController.allEmployees()}"
+								var="employee"
+								itemValue="#{employee}"
+								itemLabel="#{beanHelper.renderEmployee(employee)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -128,7 +134,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
 							>
 							<f:converter converterId="EmployeeConverter" />
-							<f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+							<f:selectItems
+								value="#{employeeController.allEmployees()}"
+								var="employee"
+								itemValue="#{employee}"
+								itemLabel="#{beanHelper.renderEmployee(employee)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -152,7 +164,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
 							>
 							<f:converter converterId="UserConverter" />
-							<f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+							<f:selectItems
+								value="#{userController.allUsers()}"
+								var="user"
+								itemValue="#{user}"
+								itemLabel="#{beanHelper.renderUser(user)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index 3a9cdff5..69dcd3eb 100644
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -97,7 +97,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
 							>
 							<f:converter converterId="BasicCompanyDataConverter" />
-							<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+							<f:selectItems
+								value="#{basicDataListController.allBasicData}"
+								var="basicData"
+								itemValue="#{basicData}"
+								itemLabel="#{beanHelper.renderBasicData(basicData)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -117,7 +123,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
 							>
 							<f:converter converterId="UserConverter" />
-							<f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+							<f:selectItems
+								value="#{userController.allUsers()}"
+								var="user"
+								itemValue="#{user}"
+								itemLabel="#{beanHelper.renderUser(user)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -151,7 +163,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
 							>
 							<f:converter converterId="EmployeeConverter" />
-							<f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+							<f:selectItems
+								value="#{employeeController.allEmployees()}"
+								var="employee"
+								itemValue="#{employee}"
+								itemLabel="#{beanHelper.renderEmployee(employee)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index 06c60883..c3ef33fd 100644
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -74,7 +74,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
 							>
 							<f:converter converterId="BasicCompanyDataConverter" />
-							<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+							<f:selectItems
+								value="#{basicDataListController.allBasicData}"
+								var="basicData"
+								itemValue="#{basicData}"
+								itemLabel="#{beanHelper.renderBasicData(basicData)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -96,7 +102,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
 							>
 							<f:converter converterId="BranchOfficeConverter" />
-							<f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+
+							<f:selectItems
+								value="#{branchOfficeListController.allBranchOffices()}"
+								var="branchOffice"
+								itemValue="#{branchOffice}"
+								itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -120,7 +132,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
 							>
 							<f:converter converterId="EmployeeConverter" />
-							<f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+							<f:selectItems
+								value="#{employeeController.allEmployees()}"
+								var="employee"
+								itemValue="#{employee}"
+								itemLabel="#{beanHelper.renderEmployee(employee)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -144,7 +162,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
 							>
 							<f:converter converterId="UserConverter" />
-							<f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+							<f:selectItems
+								value="#{userController.allUsers()}"
+								var="user"
+								itemValue="#{user}"
+								itemLabel="#{beanHelper.renderUser(user)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index 8dac5c97..04898a2c 100644
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -70,7 +70,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
 							>
 							<f:converter converterId="BranchOfficeConverter" />
-							<f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+
+							<f:selectItems
+								value="#{branchOfficeListController.allBranchOffices()}"
+								var="branchOffice"
+								itemValue="#{branchOffice}"
+								itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -93,7 +99,13 @@
 							updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
 							>
 							<f:converter converterId="UserConverter" />
-							<f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+							<f:selectItems
+								value="#{userController.allUsers()}"
+								var="user"
+								itemValue="#{user}"
+								itemLabel="#{beanHelper.renderUser(user)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -117,7 +129,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
 							>
 							<f:converter converterId="BasicCompanyDataConverter" />
-							<f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+
+							<f:selectItems
+								value="#{basicDataListController.allBasicData}"
+								var="basicData"
+								itemValue="#{basicData}"
+								itemLabel="#{beanHelper.renderBasicData(basicData)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index b728eb55..c8ec3456 100644
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -70,7 +70,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
 							>
 							<f:converter converterId="UserConverter" />
-							<f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+
+							<f:selectItems
+								value="#{userController.allUsers()}"
+								var="user"
+								itemValue="#{user}"
+								itemLabel="#{beanHelper.renderUser(user)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -104,7 +110,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
 							>
 							<f:converter converterId="EmployeeConverter" />
-							<f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+
+							<f:selectItems
+								value="#{employeeController.allEmployees()}"
+								var="employee"
+								itemValue="#{employee}"
+								itemLabel="#{beanHelper.renderEmployee(employee)}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/opening_time/admin_opening_time_list.xhtml
index a7128e1d..055c4ee7 100644
--- a/web/admin/opening_time/admin_opening_time_list.xhtml
+++ b/web/admin/opening_time/admin_opening_time_list.xhtml
@@ -68,7 +68,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_WEEK_DAYS_TITLE}"
 							>
 							<f:converter converterId="DayOfTheWeekConverter" />
-							<f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+							<f:selectItems
+								value="#{dataController.dayOfTheWeek}"
+								var="dayOfWeek"
+								itemValue="#{dayOfWeek}"
+								itemLabel="#{dayOfWeek.toString()}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
@@ -84,7 +90,13 @@
 							title="#{msg.FILTER_BY_MULTIPLE_WEEK_DAYS_TITLE}"
 							>
 							<f:converter converterId="DayOfTheWeekConverter" />
-							<f:selectItems value="#{dataController.dayOfTheWeek}" var="dayOfWeek" itemValue="#{dayOfWeek}" itemLabel="#{dayOfWeek.toString()}" />
+
+							<f:selectItems
+								value="#{dataController.dayOfTheWeek}"
+								var="dayOfWeek"
+								itemValue="#{dayOfWeek}"
+								itemLabel="#{dayOfWeek.toString()}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index d4652d6d..f5a1b057 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -176,7 +176,13 @@
 							filterMatchMode="contains"
 							>
 							<f:converter converterId="ContactConverter" />
-							<f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
+
+							<f:selectItems
+								value="#{contactController.selectableContacts()}"
+								var="contact"
+								itemValue="#{contact}"
+								itemLabel="#{beanHelper.renderContact(contact)}"
+								/>
 						</p:selectOneMenu>
 					</p:panelGrid>
 				</p:fieldset>
-- 
2.39.5