From 4e821eb6b26fd65143c1dcaa73ae4c98814113e1 Mon Sep 17 00:00:00 2001
From: Banana <mail@bananas-playground.net>
Date: Tue, 20 Feb 2024 15:19:09 +0100
Subject: [PATCH] replacfing old ifset implementation

---
 CHANGELOG                                     |  1 +
 documentation/setup/bibliotheca.sql           |  2 +-
 upgrade/from-version-1.5.txt                  |  2 +-
 upgrade/from-version-1.6.txt                  |  5 +++++
 webclient/lib/possessed.class.php             |  2 +-
 webclient/setup/bibliotheca.sql.default       |  2 +-
 .../98/advancedsearch/advancedsearch.html     |  4 ++--
 .../view/98/collections/collections.html      |  8 ++++----
 webclient/view/98/dashboard/dashboard.html    |  8 ++++----
 webclient/view/98/entry/entry.html            |  4 ++--
 webclient/view/98/entry/field-date.html       |  2 +-
 webclient/view/98/entry/field-number.html     |  2 +-
 webclient/view/98/entry/field-selection.html  |  2 +-
 webclient/view/98/entry/field-text-title.html |  2 +-
 webclient/view/98/entry/field-text.html       |  2 +-
 .../98/entry/field-text3-description.html     |  2 +-
 webclient/view/98/entry/field-text3.html      |  2 +-
 .../view/98/entry/field-textarea-content.html |  2 +-
 webclient/view/98/entry/field-textarea.html   |  2 +-
 .../98/entry/field-upload-coverimage.html     |  4 ++--
 webclient/view/98/entry/field-upload.html     |  2 +-
 webclient/view/98/entry/field-year.html       |  2 +-
 .../managecollectionfields.html               |  3 +--
 .../98/managecolletions/managecolletions.html | 15 +++++++--------
 .../98/manageentry/field-lookupmultiple.html  |  4 ++--
 .../view/98/manageentry/field-number.html     |  4 ++--
 .../view/98/manageentry/field-selection.html  |  2 +-
 webclient/view/98/manageentry/field-text.html |  6 +++---
 .../view/98/manageentry/field-text3.html      |  6 +++---
 .../view/98/manageentry/field-textarea.html   |  4 ++--
 .../view/98/manageentry/field-upload.html     |  6 +++---
 webclient/view/98/manageentry/field-year.html |  4 ++--
 .../view/98/managegroups/managegroups.html    |  6 +++---
 .../view/98/manageusers/manageusers.html      | 17 +++++++++--------
 webclient/view/98/profile/profile.html        | 19 +++++++++++++------
 webclient/view/98/tags/tags.html              |  2 +-
 webclient/view/98/tool/tool-googlebooks.html  |  2 +-
 webclient/view/98/tool/tool-imdbweb.html      |  2 +-
 webclient/view/98/tool/tool-musicbrainz.html  |  4 ++--
 webclient/view/98/tool/tool.html              |  2 +-
 .../advancedsearch/advancedsearch.html        | 10 +++++-----
 webclient/view/default/bulkedit/bulkedit.php  |  4 +---
 .../view/default/collections/collections.html |  8 ++++----
 .../view/default/dashboard/dashboard.html     |  8 ++++----
 webclient/view/default/entry/entry.html       |  5 ++---
 webclient/view/default/entry/field-date.html  |  2 +-
 .../view/default/entry/field-number.html      |  2 +-
 .../view/default/entry/field-selection.html   |  2 +-
 .../view/default/entry/field-text-title.html  |  2 +-
 webclient/view/default/entry/field-text.html  |  2 +-
 .../entry/field-text3-description.html        |  2 +-
 webclient/view/default/entry/field-text3.html |  2 +-
 .../default/entry/field-textarea-content.html |  2 +-
 .../view/default/entry/field-textarea.html    |  2 +-
 .../entry/field-upload-coverimage.html        |  4 ++--
 .../view/default/entry/field-upload.html      |  2 +-
 webclient/view/default/entry/field-year.html  |  2 +-
 .../managecollectionfields.html               |  2 +-
 .../managecolletions/managecolletions.html    | 10 +++++-----
 .../default/manageentry/field-hidden.html     |  2 +-
 .../manageentry/field-lookupmultiple.html     |  4 ++--
 .../default/manageentry/field-number.html     |  4 ++--
 .../default/manageentry/field-selection.html  |  2 +-
 .../view/default/manageentry/field-text.html  |  6 +++---
 .../view/default/manageentry/field-text3.html |  6 +++---
 .../default/manageentry/field-textarea.html   |  4 ++--
 .../default/manageentry/field-upload.html     |  6 +++---
 .../view/default/manageentry/field-year.html  |  4 ++--
 .../default/managegroups/managegroups.html    |  6 +++---
 .../view/default/manageusers/manageusers.html | 14 +++++++-------
 .../view/default/manageusers/manageusers.php  |  1 -
 webclient/view/default/profile/profile.html   | 11 +++++------
 webclient/view/default/tags/tags.html         |  2 +-
 .../view/default/tool/tool-googlebooks.html   |  2 +-
 webclient/view/default/tool/tool-imdbweb.html |  2 +-
 .../view/default/tool/tool-musicbrainz.html   |  4 ++--
 webclient/view/default/tool/tool.html         |  2 +-
 77 files changed, 167 insertions(+), 160 deletions(-)
 create mode 100644 upgrade/from-version-1.6.txt

diff --git a/CHANGELOG b/CHANGELOG
index fe6f478..f932ada 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 1.x - The Ceremonial Chambers
     * Added group infos to profile view.
     * User- and groupmanagement: Check if in use before deletion.
+    * Remove legacy ifset method and replace with ??
 
 
 1.6 - Chizra 2024-02-03
diff --git a/documentation/setup/bibliotheca.sql b/documentation/setup/bibliotheca.sql
index 89d6e03..fefa5d1 100644
--- a/documentation/setup/bibliotheca.sql
+++ b/documentation/setup/bibliotheca.sql
@@ -150,7 +150,7 @@ INSERT INTO `#REPLACEME#_sys_fields` (`id`, `identifier`, `displayname`, `type`,
 (14, 'year', 'Year', 'year', 'entrySingleNum', '`year` int(10) NULL, ADD INDEX (`year`)', '', NULL, 'int 10', '2019-09-01 19:30:11', '2021-07-09 08:30:23', 0, 1, 1, 'rw-r--r--'),
 (15, 'coverimage', 'Cover image', 'upload', NULL, NULL, '', NULL, 'One file in $_FILES[uploads] of post', '2019-09-01 19:48:44', '2021-01-02 19:56:10', 0, 1, 1, 'rw-r--r--'),
 (16, 'attachment', 'Attachments', 'upload_multiple', NULL, NULL, '', NULL, 'Multiple in $_FILES[uploads] of post', '2019-09-01 19:48:44', '2021-01-02 19:56:10', 0, 1, 1, 'rw-r--r--'),
-(17, 'os', 'Operating system and version', 'selection', 'entrySingleNum', '`os` varchar(32) NULL DEFAULT NULL', '', 'DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 99,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11', 'One of DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 99,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11', '2019-09-01 19:55:13', '2022-10-08 10:46:55', 0, 1, 1, 'rw-r--r--'),
+(17, 'os', 'Operating system and version', 'selection', 'entrySingleNum', '`os` varchar(32) NULL DEFAULT NULL', '', 'DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 98,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11', 'One of DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 98,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11', '2019-09-01 19:55:13', '2022-10-08 10:46:55', 0, 1, 1, 'rw-r--r--'),
 (18, 'actors', 'Actors', 'lookupmultiple', 'tag', NULL, 'allowSpace', NULL, 'string 64', '2020-07-26 07:12:48', '2021-04-03 14:41:48', NULL, 1, 1, 'rw-r--r--'),
 (19, 'countries', 'Countries', 'lookupmultiple', 'tag', NULL, 'allowSpace', NULL, 'string 64', '2020-07-26 07:16:08', '2021-04-03 14:41:48', NULL, 1, 1, 'rw-r--r--'),
 (20, 'directors', 'Directors', 'lookupmultiple', 'tag', NULL, 'allowSpace', NULL, 'string 64', '2020-07-26 07:17:59', '2021-04-03 14:41:48', NULL, 1, 1, 'rw-r--r--'),
diff --git a/upgrade/from-version-1.5.txt b/upgrade/from-version-1.5.txt
index 760da8d..65517b8 100644
--- a/upgrade/from-version-1.5.txt
+++ b/upgrade/from-version-1.5.txt
@@ -2,7 +2,7 @@
 As of version 1.6, the field 'Combined Search' provides a much better search base.
 How to change and use new field: Run the following sql query. Replace #REPLACEME# with the used DB prefix.
 ```
-INSERT INTO `#REPLACEME#_sys_fields` (`id`, `identifier`, `displayname`, `type`, `searchtype`, `createstring`, `inputValidation`, `value`, `apiinfo`, `created`, `modified`, `modificationuser`, `owner`, `group`, `rights`) VALUES (NULL, 'combSearch', 'Combined Search', 'hidden', 'entryText', '`combSearch` text NULL DEFAULT NULL, ADD FULLTEXT (`combSearch`)', '', NULL, 'mysql text - Content will be auto generated from other entry fields', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, '1', '1', 'rw-r--r--');
+INSERT INTO `bib_sys_fields` (`id`, `identifier`, `displayname`, `type`, `searchtype`, `createstring`, `inputValidation`, `value`, `apiinfo`, `created`, `modified`, `modificationuser`, `owner`, `group`, `rights`) VALUES (NULL, 'combSearch', 'Combined Search', 'hidden', 'entryText', '`combSearch` text NULL DEFAULT NULL, ADD FULLTEXT (`combSearch`)', '', NULL, 'mysql text - Content will be auto generated from other entry fields', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, '1', '1', 'rw-r--r--');
 ```
 Add the new field 'Combined Search' to a collection.
 Change the 'Default gloabal seach field' to 'Combined search' and save.
diff --git a/upgrade/from-version-1.6.txt b/upgrade/from-version-1.6.txt
new file mode 100644
index 0000000..4598242
--- /dev/null
+++ b/upgrade/from-version-1.6.txt
@@ -0,0 +1,5 @@
+# DB changes. Run each line against your bibliotheca DB.
+Replace #REPLACEME# with your table prefix. Default is bib
+```
+UPDATE `#REPLACEME#_sys_fields` SET `value` = 'DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 98,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11', `apiinfo` = 'One of DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 98,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11' WHERE `#REPLACEME#_sys_fields`.`id` = 17;
+```
\ No newline at end of file
diff --git a/webclient/lib/possessed.class.php b/webclient/lib/possessed.class.php
index d1007f3..dabd638 100644
--- a/webclient/lib/possessed.class.php
+++ b/webclient/lib/possessed.class.php
@@ -714,7 +714,7 @@ class Possessed {
         }
 
         if(!$ret) {
-            $queryStr = "SELECT `id` FROM `".DB_PREFIX."_user2group` 
+            $queryStr = "SELECT `fk_group_id` FROM `".DB_PREFIX."_user2group` 
                     WHERE `fk_group_id` = '".$this->_DB->real_escape_string($groupId)."'";
             if(QUERY_DEBUG) Summoner::sysLog("[QUERY] ".__METHOD__." query: ".Summoner::cleanForLog($queryStr));
             try {
diff --git a/webclient/setup/bibliotheca.sql.default b/webclient/setup/bibliotheca.sql.default
index 89d6e03..fefa5d1 100644
--- a/webclient/setup/bibliotheca.sql.default
+++ b/webclient/setup/bibliotheca.sql.default
@@ -150,7 +150,7 @@ INSERT INTO `#REPLACEME#_sys_fields` (`id`, `identifier`, `displayname`, `type`,
 (14, 'year', 'Year', 'year', 'entrySingleNum', '`year` int(10) NULL, ADD INDEX (`year`)', '', NULL, 'int 10', '2019-09-01 19:30:11', '2021-07-09 08:30:23', 0, 1, 1, 'rw-r--r--'),
 (15, 'coverimage', 'Cover image', 'upload', NULL, NULL, '', NULL, 'One file in $_FILES[uploads] of post', '2019-09-01 19:48:44', '2021-01-02 19:56:10', 0, 1, 1, 'rw-r--r--'),
 (16, 'attachment', 'Attachments', 'upload_multiple', NULL, NULL, '', NULL, 'Multiple in $_FILES[uploads] of post', '2019-09-01 19:48:44', '2021-01-02 19:56:10', 0, 1, 1, 'rw-r--r--'),
-(17, 'os', 'Operating system and version', 'selection', 'entrySingleNum', '`os` varchar(32) NULL DEFAULT NULL', '', 'DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 99,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11', 'One of DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 99,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11', '2019-09-01 19:55:13', '2022-10-08 10:46:55', 0, 1, 1, 'rw-r--r--'),
+(17, 'os', 'Operating system and version', 'selection', 'entrySingleNum', '`os` varchar(32) NULL DEFAULT NULL', '', 'DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 98,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11', 'One of DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 98,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11', '2019-09-01 19:55:13', '2022-10-08 10:46:55', 0, 1, 1, 'rw-r--r--'),
 (18, 'actors', 'Actors', 'lookupmultiple', 'tag', NULL, 'allowSpace', NULL, 'string 64', '2020-07-26 07:12:48', '2021-04-03 14:41:48', NULL, 1, 1, 'rw-r--r--'),
 (19, 'countries', 'Countries', 'lookupmultiple', 'tag', NULL, 'allowSpace', NULL, 'string 64', '2020-07-26 07:16:08', '2021-04-03 14:41:48', NULL, 1, 1, 'rw-r--r--'),
 (20, 'directors', 'Directors', 'lookupmultiple', 'tag', NULL, 'allowSpace', NULL, 'string 64', '2020-07-26 07:17:59', '2021-04-03 14:41:48', NULL, 1, 1, 'rw-r--r--'),
diff --git a/webclient/view/98/advancedsearch/advancedsearch.html b/webclient/view/98/advancedsearch/advancedsearch.html
index 5cd6d10..15d9b86 100644
--- a/webclient/view/98/advancedsearch/advancedsearch.html
+++ b/webclient/view/98/advancedsearch/advancedsearch.html
@@ -21,7 +21,7 @@
 		If the search is within a field witch is not configured to be displayed in the table view, it will be added.
 	</p>
 	<pre>title: bourne</pre>
-	<p>Available fields in <b><?php echo Summoner::ifset($TemplateData['loadedCollection'], 'name'); ?></b> are:</p>
+	<p>Available fields in <b><?php echo $TemplateData['loadedCollection']['name'] ?? ''; ?></b> are:</p>
 	<pre style="white-space: normal">
 	<?php foreach($TemplateData['collectionFields'] as $k=>$v) {
 		echo $v['identifier']." ";
@@ -112,7 +112,7 @@
 						?>
 					<td>
 						<?php
-								if(Summoner::ifset($f, 'value')) {
+								if(isset($f['value'])) {
 									if(is_array($f['value'])) {
 										echo Summoner::limitWithDots(implode(', ',$f['value']),100,'...');
 									}
diff --git a/webclient/view/98/collections/collections.html b/webclient/view/98/collections/collections.html
index f814ade..29c9a9a 100644
--- a/webclient/view/98/collections/collections.html
+++ b/webclient/view/98/collections/collections.html
@@ -56,7 +56,7 @@
 <?php } ?>
 
 <?php if(!empty($TemplateData['entries'])) { ?>
-<h3><?php echo Summoner::ifset($TemplateData['loadedCollection'], 'name'); ?></h3>
+<h3><?php echo $TemplateData['loadedCollection']['name'] ?? ''; ?></h3>
 <div class="sunken-panel">
 	<table width="100%">
 		<thead>
@@ -71,7 +71,7 @@
 		<?php foreach($TemplateData['entries']['results'] as $entryK=>$entry) { ?>
 			<tr>
 				<td>
-					<?php if(Summoner::ifset($entry['fields'], 'coverimage')) { ?>
+					<?php if(isset($entry['fields']['coverimage'])) { ?>
 					<a href="<?php echo $TemplateData['entryLinkPrefix']; ?>&id=<?php echo $entryK; ?>">
 						<img src="<?php echo $TemplateData['storagePath'].'/'.$entryK.'/'.$entry['fields']['coverimage']['value']; ?>"
 						     alt="<?php echo $entry['fields']['coverimage']['displayname']; ?>"
@@ -80,12 +80,12 @@
 					<?php } ?>
 				</td>
 				<td>
-					<?php if(Summoner::ifset($entry['fields'], 'title')) {
+					<?php if(isset($entry['fields']['title'])) {
 								echo $entry['fields']['title']['value'];
 							} ?>
 				</td>
 				<td>
-					<?php if(Summoner::ifset($entry['fields'], array('description','value'))) {
+					<?php if(isset($entry['fields']['description']['value'])) {
 								echo $entry['fields']['description']['value'];
 							} ?>
 				</td>
diff --git a/webclient/view/98/dashboard/dashboard.html b/webclient/view/98/dashboard/dashboard.html
index c393ed5..3cefe5a 100644
--- a/webclient/view/98/dashboard/dashboard.html
+++ b/webclient/view/98/dashboard/dashboard.html
@@ -20,7 +20,7 @@
 
 <?php foreach($TemplateData['latest'] as $k=>$v) { ?>
 	<h4>
-		<a href="index.php?p=collections&collection=<?php echo $k; echo Summoner::ifset($TemplateData, 'navSearched'); ?>"><?php echo $v['name']; ?></a>
+		<a href="index.php?p=collections&collection=<?php echo $k; echo $TemplateData['navSearched'] ?? ''; ?>"><?php echo $v['name']; ?></a>
 		<?php echo $v['description']; ?>
 	</h4>
 	<?php if(isset($v['entries']['results'])) { ?>
@@ -38,7 +38,7 @@
 			<?php foreach($v['entries']['results'] as $entryK=>$entry) { ?>
 				<tr>
 					<td>
-						<?php if(Summoner::ifset($entry['fields'], 'coverimage')) { ?>
+						<?php if(isset($entry['fields']['coverimage'])) { ?>
 						<a href="index.php?p=entry&collection=<?php echo $k ?>&id=<?php echo $entryK; ?>">
 							<img src="<?php echo PATH_WEB_STORAGE.'/'.$k.'/'.$entryK.'/'.$entry['fields']['coverimage']['value']; ?>"
 							     alt="<?php echo $entry['fields']['coverimage']['displayname']; ?>"
@@ -47,12 +47,12 @@
 						<?php } ?>
 					</td>
 					<td>
-						<?php if(Summoner::ifset($entry['fields'], 'title')) {
+						<?php if(isset($entry['fields']['title'])) {
 							echo $entry['fields']['title']['value'];
 						} ?>
 					</td>
 					<td>
-						<?php if(Summoner::ifset($entry['fields'], array('description','value'))) {
+						<?php if(isset($entry['fields']['description']['value'])) {
 							echo $entry['fields']['description']['value'];
 						} ?>
 					</td>
diff --git a/webclient/view/98/entry/entry.html b/webclient/view/98/entry/entry.html
index 4586e57..1affd81 100644
--- a/webclient/view/98/entry/entry.html
+++ b/webclient/view/98/entry/entry.html
@@ -1,7 +1,7 @@
-<h3><a href="index.php?p=collections&collection=<?php echo Summoner::ifset($TemplateData['loadedCollection'], 'id'); ?>"><?php echo Summoner::ifset($TemplateData['loadedCollection'], 'name'); ?></a></h3>
+<h3><a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>"><?php echo $TemplateData['loadedCollection']['name'] ?? ''; ?></a></h3>
 <article>
 	<?php if($TemplateData['showEdit'] === true) { ?>
-	<p><a href="index.php?p=manageentry&collection=<?php echo Summoner::ifset($TemplateData['loadedCollection'], 'id'); ?>&id=<?php echo $TemplateData['entry']['id']; ?>">EDIT</a></p>
+	<p><a href="index.php?p=manageentry&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>&id=<?php echo $TemplateData['entry']['id'] ?? ''; ?>">EDIT</a></p>
 	<?php
 	}
 
diff --git a/webclient/view/98/entry/field-date.html b/webclient/view/98/entry/field-date.html
index 7ebf58b..e34b64d 100644
--- a/webclient/view/98/entry/field-date.html
+++ b/webclient/view/98/entry/field-date.html
@@ -1,4 +1,4 @@
 <p data-field-name="date" data-field-id="<?php echo $field['identifier']; ?>">
 	<?php echo $field['displayname']; ?>:
-	<a href="index.php?p=collections&collection='.$TemplateData['loadedCollection']['id'].'&fid='.$field['identifier'].'&fv='.urlencode(Summoner::ifset($field, 'value')).'"><?php echo Summoner::ifset($field, 'value'); ?></a>
+	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>&fid=<?php echo $field['identifier'] ?? ''; ?>&fv=<?php echo urlencode($field['value'] ?? ''); ?>"><?php echo $field['value'] ?? ''; ?></a>
 </p>
diff --git a/webclient/view/98/entry/field-number.html b/webclient/view/98/entry/field-number.html
index 2afc484..6f748e8 100644
--- a/webclient/view/98/entry/field-number.html
+++ b/webclient/view/98/entry/field-number.html
@@ -1,4 +1,4 @@
 <p data-field-name="number" data-field-id="<?php echo $field['identifier']; ?>">
 	<?php echo $field['displayname']; ?>:
-	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode(Summoner::ifset($field, 'value')); ?>"><?php echo Summoner::ifset($field, 'value'); ?></a>
+	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode($field['value'] ?? ''); ?>"><?php echo $field['value'] ?? ''; ?></a>
 </p>
diff --git a/webclient/view/98/entry/field-selection.html b/webclient/view/98/entry/field-selection.html
index 1ab89ba..00c8ad1 100644
--- a/webclient/view/98/entry/field-selection.html
+++ b/webclient/view/98/entry/field-selection.html
@@ -1,4 +1,4 @@
 <p data-field-name="selection" data-field-id="<?php echo $field['identifier']; ?>">
 	<?php echo $field['displayname']; ?>:
-	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode(Summoner::ifset($field, 'value')); ?>"><?php echo Summoner::ifset($field, 'value'); ?></a>
+	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>&fid=<?php echo $field['identifier'] ?? ''; ?>&fv=<?php echo urlencode($field['value'] ?? ''); ?>"><?php $field['value'] ?? ''; ?></a>
 </p>
diff --git a/webclient/view/98/entry/field-text-title.html b/webclient/view/98/entry/field-text-title.html
index fbfb079..07501b9 100644
--- a/webclient/view/98/entry/field-text-title.html
+++ b/webclient/view/98/entry/field-text-title.html
@@ -1 +1 @@
-<h1 data-field-name="text-title" data-field-id="<?php echo $field['identifier']; ?>"><?php echo Summoner::ifset($field, 'value'); ?></h1>
+<h1 data-field-name="text-title" data-field-id="<?php echo $field['identifier']; ?>"><?php echo $field['value'] ?? ''; ?></h1>
diff --git a/webclient/view/98/entry/field-text.html b/webclient/view/98/entry/field-text.html
index 4c5c67a..aa2573e 100644
--- a/webclient/view/98/entry/field-text.html
+++ b/webclient/view/98/entry/field-text.html
@@ -1,3 +1,3 @@
 <p data-field-name="text" data-field-id="<?php echo $field['identifier']; ?>">
-	<?php echo $field['displayname']; ?>: <?php echo nl2br(Summoner::ifset($field, 'value')); ?>
+	<?php echo $field['displayname']; ?>: <?php echo nl2br($field['value'] ?? ''); ?>
 </p>
diff --git a/webclient/view/98/entry/field-text3-description.html b/webclient/view/98/entry/field-text3-description.html
index 18ba661..86923b7 100644
--- a/webclient/view/98/entry/field-text3-description.html
+++ b/webclient/view/98/entry/field-text3-description.html
@@ -1 +1 @@
-<p data-field-name="text3-description" data-field-id="<?php echo $field['identifier']; ?>"><?php echo nl2br(Summoner::ifset($field, 'value')); ?></p>
+<p data-field-name="text3-description" data-field-id="<?php echo $field['identifier']; ?>"><?php echo nl2br($field['value'] ?? ''); ?></p>
diff --git a/webclient/view/98/entry/field-text3.html b/webclient/view/98/entry/field-text3.html
index 1210cdf..3a65749 100644
--- a/webclient/view/98/entry/field-text3.html
+++ b/webclient/view/98/entry/field-text3.html
@@ -1,3 +1,3 @@
 <p data-field-name="text3" data-field-id="<?php echo $field['identifier']; ?>">
-	<?php echo $field['displayname']; ?>: <?php echo nl2br(Summoner::ifset($field, 'value')); ?>
+	<?php echo $field['displayname']; ?>: <?php echo nl2br($field['value'] ?? ''); ?>
 </p>
diff --git a/webclient/view/98/entry/field-textarea-content.html b/webclient/view/98/entry/field-textarea-content.html
index f739df2..8e440b8 100644
--- a/webclient/view/98/entry/field-textarea-content.html
+++ b/webclient/view/98/entry/field-textarea-content.html
@@ -1 +1 @@
-<p data-field-name="textarea-content" data-field-id="<?php echo $field['identifier']; ?>"><?php echo nl2br(Summoner::ifset($field, 'value')); ?></p>
+<p data-field-name="textarea-content" data-field-id="<?php echo $field['identifier']; ?>"><?php echo nl2br($field['value'] ?? ''); ?></p>
diff --git a/webclient/view/98/entry/field-textarea.html b/webclient/view/98/entry/field-textarea.html
index 3520a52..9600337 100644
--- a/webclient/view/98/entry/field-textarea.html
+++ b/webclient/view/98/entry/field-textarea.html
@@ -1 +1 @@
-<p data-field-name="textarea" data-field-id="<?php echo $field['identifier']; ?>"><?php echo $field['displayname']; ?>: <?php echo nl2br(Summoner::ifset($field, 'value')); ?></p>
+<p data-field-name="textarea" data-field-id="<?php echo $field['identifier']; ?>"><?php echo $field['displayname']; ?>: <?php echo nl2br($field['value'] ?? ''); ?></p>
diff --git a/webclient/view/98/entry/field-upload-coverimage.html b/webclient/view/98/entry/field-upload-coverimage.html
index 3ac58ee..a476a41 100644
--- a/webclient/view/98/entry/field-upload-coverimage.html
+++ b/webclient/view/98/entry/field-upload-coverimage.html
@@ -1,6 +1,6 @@
 <div data-field-name="upload-coverimage">
-	<img src="<?php echo $TemplateData['storagePath'].'/'.Summoner::ifset($field, 'value'); ?>"
-		 title="<?php echo Summoner::ifset($field, 'value'); ?>"
+	<img src="<?php echo $TemplateData['storagePath'].'/'.$field['value'] ?? ''; ?>"
+		 title="<?php echo $field['value'] ?? ''; ?>"
 		 width="500px"
 	/>
 </div>
diff --git a/webclient/view/98/entry/field-upload.html b/webclient/view/98/entry/field-upload.html
index 6232e6d..431301a 100644
--- a/webclient/view/98/entry/field-upload.html
+++ b/webclient/view/98/entry/field-upload.html
@@ -1,3 +1,3 @@
 <p data-field-name="upload" data-field-id="<?php echo $field['identifier']; ?>"><?php echo $field['displayname']; ?>:
-	<a href="<?php echo $TemplateData['storagePath'].'/'.Summoner::ifset($field, 'value'); ?>" target="_blank"><?php echo Summoner::ifset($field, 'value'); ?></a>
+	<a href="<?php echo $TemplateData['storagePath'].'/'.$field['value'] ?? ''; ?>" target="_blank"><?php echo $field['value'] ?? ''; ?></a>
 </p>
diff --git a/webclient/view/98/entry/field-year.html b/webclient/view/98/entry/field-year.html
index a5dd7b8..f19b736 100644
--- a/webclient/view/98/entry/field-year.html
+++ b/webclient/view/98/entry/field-year.html
@@ -1,4 +1,4 @@
 <p data-field-name="year" data-field-id="<?php echo $field['identifier']; ?>">
 	<?php echo $field['displayname']; ?>:
-	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode(Summoner::ifset($field, 'value')); ?>"><?php echo Summoner::ifset($field, 'value'); ?></a>
+	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode($field['value'] ?? ''); ?>"><?php echo $field['value'] ?? ''; ?></a>
 </p>
diff --git a/webclient/view/98/managecollectionfields/managecollectionfields.html b/webclient/view/98/managecollectionfields/managecollectionfields.html
index fb163d0..886be30 100644
--- a/webclient/view/98/managecollectionfields/managecollectionfields.html
+++ b/webclient/view/98/managecollectionfields/managecollectionfields.html
@@ -40,12 +40,11 @@
 
 <form method="post" onsubmit="return saveOrderAndSubmit()">
 	<input type="hidden" name="fdata[fieldSortString]" id="fieldSort"
-	   value="<?php echo Summoner::ifset($TemplateData['editData'], 'fieldSortString'); ?>">
+	   value="<?php echo $TemplateData['editData']['fieldSortString'] ?? ''; ?>">
 	<input type="submit" name="submitForm" value="Save">
 </form>
 
 
-
 <script src="view/98/ui/js/sortable.js"></script>
 <script>
 	new Sortable(collectionFields, {
diff --git a/webclient/view/98/managecolletions/managecolletions.html b/webclient/view/98/managecolletions/managecolletions.html
index 8401f5b..e68780a 100644
--- a/webclient/view/98/managecolletions/managecolletions.html
+++ b/webclient/view/98/managecolletions/managecolletions.html
@@ -9,12 +9,12 @@
 		<label for="name">Name *</label>
 		<input id="name" type="text" autocomplete="off" name="fdata[name]"
             placeholder="Unique name. No special chars." size="30"
-			value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
+			value="<?php echo $TemplateData['editData']['name'] ?? ''; ?>">
     </div>
 	<div class="field-row-stacked">
 		<label for="description">Description</label>
 		<input id="description" type="text" autocomplete="off" size="30" name="fdata[description]"
-		       value="<?php echo Summoner::ifset($TemplateData['editData'], 'description'); ?>">
+		       value="<?php echo $TemplateData['editData']['description'] ?? ''; ?>">
    </div>
 	<div class="field-row-stacked">
 		<label for="defaultSearchField">Default global search field</label>
@@ -22,7 +22,7 @@
 			<option value="">Please select</option>
 			<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
 			<option value="<?php echo $v['identifier']; ?>"
-			<?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSearchField', $v['identifier'])) echo 'selected'; ?>
+			<?php if(isset($TemplateData['editData']['defaultSearchField'][$v['identifier']])) echo 'selected'; ?>
 			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
 			<?php } ?>
 		</select>
@@ -49,7 +49,7 @@
 			<option value="">Please select</option>
 			<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
 			<option value="<?php echo $v['identifier']; ?>"
-			<?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortField', $v['identifier'])) echo 'selected'; ?>
+			<?php if(isset($TemplateData['editData']['defaultSortField'][$v['identifier']])) echo 'selected'; ?>
 			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
 			<?php } ?>
 		</select>
@@ -66,7 +66,7 @@
 		<select id="advancedSearchTableFields" name="fdata[advancedSearchTableFields][]" multiple="multiple" size="5">
 			<?php foreach($TemplateData['existingFields'] as $k=>$v) { ?>
 			<option value="<?php echo $v['id']; ?>"
-			<?php if(Summoner::ifset($TemplateData['editData']['advancedSearchTableFields'], $v['id'])) echo 'selected'; ?>
+			<?php if(isset($TemplateData['editData']['advancedSearchTableFields'][$v['id']])) echo 'selected'; ?>
 			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
 			<?php } ?>
 		</select>
@@ -83,7 +83,7 @@
 				<option value="">None</option>
 				<?php foreach($TemplateData['toolSelection'] as $k=>$v) { ?>
 				<option value="<?php echo $k; ?>"
-				<?php if(Summoner::ifset($TemplateData['editData']['tool'],$k)) echo 'selected'; ?>
+				<?php if(isset($TemplateData['editData']['tool'][$k])) echo 'selected'; ?>
 				><?php echo $v['name']; ?> (<?php echo $v['description']; ?>)</option>
 				<?php } ?>
 			</select>
@@ -166,12 +166,11 @@
 			</tbody>
 		</table>
 	</div>
-	<?php if(Summoner::ifset($TemplateData['editData'], 'name')) { ?>
+	<?php if(isset($TemplateData['editData']['name'])) { ?>
 	<div class="field-row-stacked">
 		<input id="doRightsForEntries" type="checkbox" name="fdata[doRightsForEntries]" value="1">
 		<label for="doRightsForEntries">Overwrite existing rights</label>
 			Warning: This will overwrite existing entry rights (user, group, rights) with the ones from the collection!
-		</label>
 	</div>
 	<div class="field-row-stacked">
 		<input id="doDelete" type="checkbox" name="fdata[doDelete]" value="1">
diff --git a/webclient/view/98/manageentry/field-lookupmultiple.html b/webclient/view/98/manageentry/field-lookupmultiple.html
index 5676631..0cea1ff 100644
--- a/webclient/view/98/manageentry/field-lookupmultiple.html
+++ b/webclient/view/98/manageentry/field-lookupmultiple.html
@@ -1,6 +1,6 @@
 <?php
 $existingFieldValue = array();
-if(Summoner::ifset($TemplateData['editData'], $field['identifier'])) {
+if(isset($TemplateData['editData'][$field['identifier']])) {
 	$existingFieldValue = $TemplateData['editData'][$field['identifier']];
 }
 ?>
@@ -27,7 +27,7 @@ if(Summoner::ifset($TemplateData['editData'], $field['identifier'])) {
 		onkeypress="addTag(event,'<?php echo $field['identifier']; ?>','<?php echo $field['inputValidation']; ?>')"
 		placeholder="Write and press enter."
 	>
-	<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+	<?php if(isset($field['bulkedit'])) { ?>
 	<select name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 		<option value="">Select bulk edit option</option>
 		<option value="add">Add</option>
diff --git a/webclient/view/98/manageentry/field-number.html b/webclient/view/98/manageentry/field-number.html
index 1e68465..b1e61a8 100644
--- a/webclient/view/98/manageentry/field-number.html
+++ b/webclient/view/98/manageentry/field-number.html
@@ -3,10 +3,10 @@
 	<input id="<?php echo $field['identifier']; ?>" type="number"
 	       autocomplete="off" maxlength="10"
 	       name="fdata[<?php echo $field['identifier']; ?>]"
-	       value="<?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?>"
+	       value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
 	/>
 
-	<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+	<?php if(isset($field['bulkedit'])) { ?>
 	<select name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 		<option value="">Select bulk edit option</option>
 		<option value="replace">Replace</option>
diff --git a/webclient/view/98/manageentry/field-selection.html b/webclient/view/98/manageentry/field-selection.html
index 28bd051..a494ac3 100644
--- a/webclient/view/98/manageentry/field-selection.html
+++ b/webclient/view/98/manageentry/field-selection.html
@@ -9,7 +9,7 @@
 		<?php } ?>
 	</select>
 
-	<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+	<?php if(isset($field['bulkedit'])) { ?>
 	<select name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 		<option value="">Select bulk edit option</option>
 		<option value="replace">Replace</option>
diff --git a/webclient/view/98/manageentry/field-text.html b/webclient/view/98/manageentry/field-text.html
index 2d94cd3..3f56aa7 100644
--- a/webclient/view/98/manageentry/field-text.html
+++ b/webclient/view/98/manageentry/field-text.html
@@ -1,14 +1,14 @@
 <div class="field-row-stacked">
 	<label for="<?php echo $field['identifier']; ?>"><?php echo $field['displayname']; ?>
-		(<span id="<?php echo $field['identifier']; ?>_counter"><?php echo 128-strlen(Summoner::ifset($TemplateData['editData'], $field['identifier'])); ?></span>)
+		(<span id="<?php echo $field['identifier']; ?>_counter"><?php echo 128-strlen($TemplateData['editData'][$field['identifier']] ?? ''); ?></span>)
 	</label>
 	<input id="<?php echo $field['identifier']; ?>" type="text" autocomplete="off"
 	   name="fdata[<?php echo $field['identifier']; ?>]"
-	   value="<?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?>"
+	   value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
        maxlength="128"
 	/>
 
-	<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+	<?php if(isset($field['bulkedit'])) { ?>
 	<select name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 		<option value="">Select bulk edit option</option>
 		<option value="add">Add</option>
diff --git a/webclient/view/98/manageentry/field-text3.html b/webclient/view/98/manageentry/field-text3.html
index 41183c6..4ce4a3d 100644
--- a/webclient/view/98/manageentry/field-text3.html
+++ b/webclient/view/98/manageentry/field-text3.html
@@ -1,14 +1,14 @@
 <div class="field-row-stacked">
 	<label for="<?php echo $field['identifier']; ?>">
 		<?php echo $field['displayname']; ?>
-		(<span id="<?php echo $field['identifier']; ?>_counter" ><?php echo 255-strlen(Summoner::ifset($TemplateData['editData'], $field['identifier'])); ?></span>)
+		(<span id="<?php echo $field['identifier']; ?>_counter" ><?php echo 255-strlen($TemplateData['editData'][$field['identifier']] ?? ''); ?></span>)
 	</label>
 	<textarea autocomplete="off"
 			  id="<?php echo $field['identifier']; ?>"
 			  rows="3" maxlength="255"
-			  name="fdata[<?php echo $field['identifier']; ?>]"><?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?></textarea>
+			  name="fdata[<?php echo $field['identifier']; ?>]"><?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?></textarea>
 
-	<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+	<?php if(isset($field['bulkedit'])) { ?>
 	<select  name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 		<option value="">Select bulk edit option</option>
 		<option value="add">Add</option>
diff --git a/webclient/view/98/manageentry/field-textarea.html b/webclient/view/98/manageentry/field-textarea.html
index b89c5b9..0623df5 100644
--- a/webclient/view/98/manageentry/field-textarea.html
+++ b/webclient/view/98/manageentry/field-textarea.html
@@ -3,8 +3,8 @@
 	<textarea autocomplete="off"
 		id="<?php echo $field['identifier']; ?>"
         rows="10"
-		name="fdata[<?php echo $field['identifier']; ?>]"><?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?></textarea>
-	<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+		name="fdata[<?php echo $field['identifier']; ?>]"><?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?></textarea>
+	<?php if(isset($field['bulkedit'])) { ?>
 	<select name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 		<option value="">Select bulk edit option</option>
 		<option value="add">Add</option>
diff --git a/webclient/view/98/manageentry/field-upload.html b/webclient/view/98/manageentry/field-upload.html
index 2cd1889..9646afb 100644
--- a/webclient/view/98/manageentry/field-upload.html
+++ b/webclient/view/98/manageentry/field-upload.html
@@ -5,9 +5,9 @@
 		   name="fdata[<?php echo $field['identifier']; ?>]"
 		/>
 
-		<?php if(Summoner::ifset($TemplateData['editData'], $field['identifier'])) { ?>
-		<?php echo '<a href="'.$TemplateData['storagePath'].'/'.Summoner::ifset($TemplateData['editData'], $field['identifier']).'">'.Summoner::ifset($TemplateData['editData'], $field['identifier']).'</a>'; ?>
-		<input type="checkbox" value="<?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?>"
+		<?php if(isset($TemplateData['editData'][$field['identifier']])) { ?>
+		<?php echo '<a href="'.$TemplateData['storagePath'].'/'.$TemplateData['editData'][$field['identifier']] ?? ''.'">'.$TemplateData['editData'][$field['identifier']] ?? ''.'</a>'; ?>
+		<input type="checkbox" value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
 			   name="fdata[<?php echo $field['identifier']; ?>_delete]"
 			   title="Delete"
 			   id="fdata[<?php echo $field['identifier']; ?>_delete"
diff --git a/webclient/view/98/manageentry/field-year.html b/webclient/view/98/manageentry/field-year.html
index 143893d..5c93dfd 100644
--- a/webclient/view/98/manageentry/field-year.html
+++ b/webclient/view/98/manageentry/field-year.html
@@ -3,10 +3,10 @@
 	<input id="<?php echo $field['identifier']; ?>" type="number" autocomplete="off"
 		placeholder="YYYY" min="0000" max="9999"
 		name="fdata[<?php echo $field['identifier']; ?>]"
-		value="<?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?>"
+		value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
 	/>
 
-	<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+	<?php if(isset($field['bulkedit'])) { ?>
 	<select name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 		<option value="">Select bulk edit option</option>
 		<option value="replace">Replace</option>
diff --git a/webclient/view/98/managegroups/managegroups.html b/webclient/view/98/managegroups/managegroups.html
index 2b49990..d2a4d1f 100644
--- a/webclient/view/98/managegroups/managegroups.html
+++ b/webclient/view/98/managegroups/managegroups.html
@@ -5,15 +5,15 @@
 	<div class="field-row-stacked">
 		<label for="name">Name *</label>
 		<input id="name" type="text" autocomplete="off" name="fdata[name]"
-			value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
+			value="<?php echo $TemplateData['editData']['name'] ?? ''; ?>">
 	</div>
 	<div class="field-row-stacked">
 		<label for="description">Description *</label>
 		<input id="description" type="text" autocomplete="off" name="fdata[description]"
-		       value="<?php echo Summoner::ifset($TemplateData['editData'], 'description'); ?>">
+		       value="<?php echo $TemplateData['editData']['description'] ?? ''; ?>">
 	</div>
 
-	<?php if(Summoner::ifset($TemplateData['editData'], 'name') && Summoner::ifsetValue($TemplateData['editData'], 'protected', '0')) { ?>
+	<?php if(isset($TemplateData['editData']['name']) && Summoner::ifsetValue($TemplateData['editData'], 'protected', '0')) { ?>
 	<div class="field-row-stacked">
 		<p>
 			Warning: Content owned by this group will not be deleted and thus only manageable by admin!<br />
diff --git a/webclient/view/98/manageusers/manageusers.html b/webclient/view/98/manageusers/manageusers.html
index 4ba8473..2ee133d 100644
--- a/webclient/view/98/manageusers/manageusers.html
+++ b/webclient/view/98/manageusers/manageusers.html
@@ -5,12 +5,12 @@
 	<div class="field-row-stacked">
 		<label for="username">Username *</label>
 		<input id="username" type="text" autocomplete="off" name="fdata[username]"
-			value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
+			value="<?php echo $TemplateData['editData']['name'] ?? ''; ?>">
 	</div>
 	<div class="field-row-stacked">
 		<label for="login">Login *</label>
 		<input id="login" type="text" autocomplete="off" name="fdata[login]"
-			value="<?php echo Summoner::ifset($TemplateData['editData'], 'login'); ?>">
+			value="<?php echo $TemplateData['editData']['login'] ?? ''; ?>">
 	</div>
 	<div class="field-row-stacked">
 		<label for="password">Password *</label>
@@ -34,20 +34,21 @@
 			<option value="">None</option>
 			<?php foreach($TemplateData['existingGroups'] as $k=>$v) { ?>
 			<option value="<?php echo $k; ?>"
-			<?php if(Summoner::ifset($TemplateData['editData']['groups'],$k)) echo 'selected'; ?>
+			<?php if(isset($TemplateData['editData']['groups'][$k])) echo 'selected'; ?>
 			><?php echo $v['name']; ?> (<?php echo $v['description']; ?>)</option>
 			<?php } ?>
 		</select>
 	</div>
 	<div class="field-row-stacked">
 		<input id="active" type="checkbox" name="fdata[active]" value="1"
-			<?php if(Summoner::ifset($TemplateData['editData'], 'active')) echo "checked"; ?>>
+			<?php if(isset($TemplateData['editData']['active'])) echo "checked"; ?>>
 		<label for="active">Can login</label>
 	</div>
-	<?php if(Summoner::ifset($TemplateData['editData'], 'name') && Summoner::ifsetValue($TemplateData['editData'], 'protected', '0')) { ?>
+	<?php if(isset($TemplateData['editData']['name']) && Summoner::ifsetValue($TemplateData['editData'], 'protected', '0')) { ?>
 	<div class="field-row-stacked">
 		<input id="delete" type="checkbox" name="fdata[doDelete]" value="1">
-		<label for="delete">Delete. Warning: Content owned by this user will not be deleted and thus only manageable by admin! Better disable the user if there is content.</label>
+		<label for="delete">Delete.</label>
+		Warning: Content owned by this user will not be deleted and thus only manageable by admin! Better disable the user if there is content.</label>
 	</div>
 	<div class="field-row-stacked">
 		<input id="refreshApiToken" type="checkbox" name="fdata[refreshApiToken]" value="1">
@@ -55,8 +56,8 @@
 	</div>
 	<div class="field-row-stacked">
 		<label>
-			Current Token: <?php echo Summoner::ifset($TemplateData['editData'], 'apiToken'); ?><br />
-			Valid until: <?php echo Summoner::ifset($TemplateData['editData'], 'apiTokenValidDate'); ?>
+			Current Token: <?php echo $TemplateData['editData']['apiToken'] ?? ''; ?><br />
+			Valid until: <?php echo $TemplateData['editData']['apiTokenValidDate'] ?? ''; ?>
 		</label>
 	</div>
 	<?php } ?>
diff --git a/webclient/view/98/profile/profile.html b/webclient/view/98/profile/profile.html
index a95be20..9481578 100644
--- a/webclient/view/98/profile/profile.html
+++ b/webclient/view/98/profile/profile.html
@@ -4,7 +4,7 @@
 	<div class="field-row-stacked">
 		<label for="username">Username</label>
 		<input id="username" type="text" autocomplete="off" name="fdata[username]"
-		       value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
+		       value="<?php echo $TemplateData['editData']['name'] ?? ''; ?>">
 	</div>
 	<div class="field-row-stacked">
 		<label for="password">Password</label>
@@ -13,12 +13,19 @@
 	<div class="field-row-stacked">
 		<label for="group">Main group</label>
 		<input  id="group" type="text" name="fdata[group]" disabled
-			value="<?php echo Summoner::ifset($TemplateData['editData'], 'baseGroupName'); ?>">
+			value="<?php echo $TemplateData['editData']['baseGroupName'] ?? ''; ?>">
 	</div>
 	<div class="field-row-stacked">
 		<label for="additionalGroups">Additional groups</label>
-		<input id="additionalGroups" type="text" name="fdata[additionalGroups]" disabled
-			value="To be done">
+		<select multiple="multiple" size="5" id="additionalGroups" name="fdata[additionalGroups]" disabled>
+			<?php
+			foreach($TemplateData['editData']['groups'] as $k=>$v) {
+				if($v['groupName'] !== $TemplateData['editData']['baseGroupName']) {
+					echo "<option>".$v['groupName']."</option>";
+				}
+			}
+			?>
+		</select>
 	</div>
 	<div class="field-row-stacked">
 		<input id="refreshApiToken" type="checkbox" name="fdata[refreshApiToken]" value="1">
@@ -26,8 +33,8 @@
 	</div>
 	<div class="field-row-stacked">
 		<label>
-			Valid until: <?php echo Summoner::ifset($TemplateData['editData'], 'apiTokenValidDate'); ?><br />
-			Token: <?php echo Summoner::ifset($TemplateData['editData'], 'apiToken'); ?>
+			Valid until: <?php echo $TemplateData['editData']['apiTokenValidDate'] ?? ''; ?><br />
+			Token: <?php echo $TemplateData['editData']['apiToken'] ?? ''; ?>
 		</label>
 	</div>
 	<div class="field-row-stacked">
diff --git a/webclient/view/98/tags/tags.html b/webclient/view/98/tags/tags.html
index bcb4e11..93cee6a 100644
--- a/webclient/view/98/tags/tags.html
+++ b/webclient/view/98/tags/tags.html
@@ -19,7 +19,7 @@
 <?php } ?>
 
 <?php if(!empty($TemplateData['tags'])) { ?>
-	<h3>Tags for: <a href="index.php?p=collections&collection=<?php echo Summoner::ifset($TemplateData['loadedCollection'], 'id'); ?>"><?php echo Summoner::ifset($TemplateData['loadedCollection'], 'name'); ?></a></h3>
+	<h3>Tags for: <a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>"><?php echo $TemplateData['loadedCollection']['name'] ?? ''; ?></a></h3>
 
 	<?php foreach($TemplateData['tags'] as $k=>$v) { ?>
 	<h4><?php echo $v['displayname']; ?></h4>
diff --git a/webclient/view/98/tool/tool-googlebooks.html b/webclient/view/98/tool/tool-googlebooks.html
index b6f0f49..13974c1 100644
--- a/webclient/view/98/tool/tool-googlebooks.html
+++ b/webclient/view/98/tool/tool-googlebooks.html
@@ -9,7 +9,7 @@
 		<label  for="search">Search ISBN</label>
 		<input id="search" type="text" autocomplete="off"
 		       name="fdata[search]"
-		       value="<?php echo Summoner::ifset($TemplateData['editEntry'], 'isbn'); ?>"
+		       value="<?php echo $TemplateData['editEntry']['isbn'] ?? ''; ?>"
 		/>
 	</div>
 	<div class="field-row-stacked">
diff --git a/webclient/view/98/tool/tool-imdbweb.html b/webclient/view/98/tool/tool-imdbweb.html
index 505c175..e78dc9d 100644
--- a/webclient/view/98/tool/tool-imdbweb.html
+++ b/webclient/view/98/tool/tool-imdbweb.html
@@ -8,7 +8,7 @@
 		<label for="search">Search</label>
 		<input id="search" type="text" autocomplete="off"
 			   name="fdata[search]"
-			   value="<?php echo Summoner::ifset($TemplateData['editEntry'], 'title'); ?>"
+			   value="<?php echo $TemplateData['editEntry']['title'] ?? ''; ?>"
 		/>
 	</div>
 	<div class="field-row-stacked">
diff --git a/webclient/view/98/tool/tool-musicbrainz.html b/webclient/view/98/tool/tool-musicbrainz.html
index 6d7b679..001eb68 100644
--- a/webclient/view/98/tool/tool-musicbrainz.html
+++ b/webclient/view/98/tool/tool-musicbrainz.html
@@ -8,14 +8,14 @@
 		<label for="artist">Artist</label>
 		<input id="artist" type="text" autocomplete="off"
 			name="fdata[artist]"
-			value="<?php echo Summoner::ifset($TemplateData['editEntry'], 'artist'); ?>"
+			value="<?php echo $TemplateData['editEntry']['artist'] ?? ''; ?>"
 		>
 	</div>
 	<div class="field-row-stacked">
 		<label for="album">Album/Title</label>
 		<input class="uk-input" id="album" type="text" autocomplete="off"
 		       name="fdata[album]"
-		       value="<?php echo Summoner::ifset($TemplateData['editEntry'], 'title'); ?>"
+		       value="<?php echo $TemplateData['editEntry']['title'] ?? ''; ?>"
 		>
 	</div>
 	<div class="field-row-stacked">
diff --git a/webclient/view/98/tool/tool.html b/webclient/view/98/tool/tool.html
index 6a2fdf5..6c8c7cb 100644
--- a/webclient/view/98/tool/tool.html
+++ b/webclient/view/98/tool/tool.html
@@ -1,7 +1,7 @@
 <h3 >Using <?php echo $TemplateData['tool']['name']; ?> with collection: <?php echo $TemplateData['collection']['name']; ?></h3>
 <?php if(!empty($TemplateData['editEntry'])) { ?>
 <p>
-	<a href="index.php?p=manageentry&collection=<?php echo $TemplateData['collection']['id']; ?>&id=<?php echo $TemplateData['editEntry']['id']; ?>"><?php echo Summoner::ifset($TemplateData['editEntry'], 'title'); ?></a>
+	<a href="index.php?p=manageentry&collection=<?php echo $TemplateData['collection']['id']; ?>&id=<?php echo $TemplateData['editEntry']['id']; ?>"><?php echo $TemplateData['editEntry']['title'] ?? ''; ?></a>
 </p>
 <?php } ?>
 
diff --git a/webclient/view/default/advancedsearch/advancedsearch.html b/webclient/view/default/advancedsearch/advancedsearch.html
index ad91493..5eb85b7 100644
--- a/webclient/view/default/advancedsearch/advancedsearch.html
+++ b/webclient/view/default/advancedsearch/advancedsearch.html
@@ -63,7 +63,7 @@
 			If the search is within a field witch is not configured to be displayed in the table view, it will be added.
 		</p>
 		eg.: <code>title: bourne</code>
-		<p>Available fields in <b><?php echo Summoner::ifset($TemplateData['loadedCollection'], 'name'); ?></b> are:</p>
+		<p>Available fields in <b><?php echo $TemplateData['loadedCollection']['name'] ?? ''; ?></b> are:</p>
 		<pre style="white-space: normal">
 		<?php
 		foreach($TemplateData['collectionFields'] as $k=>$v) {
@@ -115,7 +115,7 @@
 		?>
 			<td>
 				<?php
-				if(Summoner::ifset($f, 'value')) {
+				if(isset($f['value'])) {
 					if(is_array($f['value'])) {
 						echo Summoner::limitWithDots(implode(', ',$f['value']),100,'...');
 					}
@@ -142,7 +142,7 @@
 	<div class="uk-width-1-4@s uk-width-1-6@l">
 		<div class="uk-card uk-card-default uk-card-small">
 			<div class="uk-card-media-top">
-				<?php if(Summoner::ifset($entry['fields'], 'coverimage')) { ?>
+				<?php if(isset($entry['fields']['coverimage'])) { ?>
 				<a href="<?php echo $TemplateData['entryLinkPrefix']; ?>&id=<?php echo $entryK; ?>" target=_blank>
 				<img src="<?php echo $TemplateData['storagePath'].'/'.$entryK.'/'.$entry['fields']['coverimage']['value']; ?>"
 				     alt="<?php echo $entry['fields']['coverimage']['displayname']; ?>">
@@ -150,11 +150,11 @@
 				<?php } ?>
 			</div>
 			<div class="uk-card-body uk-visible@l">
-				<?php if(Summoner::ifset($entry['fields'], 'title')) { ?>
+				<?php if(isset($entry['fields']['title'])) { ?>
 				<h3 class="uk-card-title"><?php echo $entry['fields']['title']['value']; ?></h3>
 				<?php } ?>
 
-				<?php if(Summoner::ifset($entry['fields'], 'description')) { ?>
+				<?php if(isset($entry['fields']['description'])) { ?>
 				<p><?php echo $entry['fields']['description']['value']; ?></p>
 				<?php } ?>
 			</div>
diff --git a/webclient/view/default/bulkedit/bulkedit.php b/webclient/view/default/bulkedit/bulkedit.php
index 056a10c..4060232 100644
--- a/webclient/view/default/bulkedit/bulkedit.php
+++ b/webclient/view/default/bulkedit/bulkedit.php
@@ -62,9 +62,7 @@ if(!empty($_collection)) {
 
 				if (!empty($fdata)) {
 					foreach ($TemplateData['editFields'] as $fieldId=>$fieldData) {
-						if(isset($fdata['additionalEditOption'][$fieldData['identifier']])
-							&& !empty($fdata['additionalEditOption'][$fieldData['identifier']])) {
-
+						if(isset($fdata['additionalEditOption'][$fieldData['identifier']])) {
 							$fieldData['bulkeditMethod'] = $fdata['additionalEditOption'][$fieldData['identifier']];
 							if(isset($fdata[$fieldData['identifier']])) {
 								$_value = trim($fdata[$fieldData['identifier']]);
diff --git a/webclient/view/default/collections/collections.html b/webclient/view/default/collections/collections.html
index 80a1112..d16e2f5 100644
--- a/webclient/view/default/collections/collections.html
+++ b/webclient/view/default/collections/collections.html
@@ -51,13 +51,13 @@
 <?php } ?>
 
 <?php if(!empty($TemplateData['entries'])) { ?>
-<h3 class="uk-h3"><?php echo Summoner::ifset($TemplateData['loadedCollection'], 'name'); ?></h3>
+<h3 class="uk-h3"><?php echo $TemplateData['loadedCollection']['name'] ?? ''; ?></h3>
 <div class="uk-grid-small uk-grid-match" uk-grid>
 	<?php foreach($TemplateData['entries']['results'] as $entryK=>$entry) { ?>
 	<div class="uk-width-1-4@s uk-width-1-6@l">
 		<div class="uk-card uk-card-default uk-card-small">
 			<div class="uk-card-media-top">
-				<?php if(Summoner::ifset($entry['fields'], 'coverimage')) { ?>
+				<?php if(isset($entry['fields']['coverimage'])) { ?>
 				<a href="<?php echo $TemplateData['entryLinkPrefix']; ?>&id=<?php echo $entryK; ?>">
 				<img src="<?php echo $TemplateData['storagePath'].'/'.$entryK.'/'.$entry['fields']['coverimage']['value']; ?>"
 					 alt="<?php echo $entry['fields']['coverimage']['displayname']; ?>">
@@ -65,11 +65,11 @@
 				<?php } ?>
 			</div>
 			<div class="uk-card-body uk-visible@l">
-				<?php if(Summoner::ifset($entry['fields'], 'title')) { ?>
+				<?php if(isset($entry['fields']['title'])) { ?>
 				<h3 class="uk-card-title"><?php echo $entry['fields']['title']['value']; ?></h3>
 				<?php } ?>
 
-				<?php if(Summoner::ifset($entry['fields'], array('description','value'))) { ?>
+				<?php if(isset($entry['fields']['description']['value'])) { ?>
 				<p><?php echo $entry['fields']['description']['value']; ?></p>
 				<?php } ?>
 			</div>
diff --git a/webclient/view/default/dashboard/dashboard.html b/webclient/view/default/dashboard/dashboard.html
index d067fac..40966c7 100644
--- a/webclient/view/default/dashboard/dashboard.html
+++ b/webclient/view/default/dashboard/dashboard.html
@@ -13,7 +13,7 @@
 <div class="uk-grid-divider uk-child-width-expand@s" uk-grid>
 <?php foreach($TemplateData['latest'] as $k=>$v) { ?>
 	<div class="uk-width-1@s uk-width-1-2@m uk-width-1-3@l">
-		<a href="index.php?p=collections&collection=<?php echo $k; echo Summoner::ifset($TemplateData, 'navSearched'); ?>"><?php echo $v['name']; ?></a><br  />
+		<a href="index.php?p=collections&collection=<?php echo $k; echo $TemplateData['navSearched'] ?? ''; ?>"><?php echo $v['name']; ?></a><br  />
 		<?php echo $v['description']; ?>
 
 		<?php
@@ -22,7 +22,7 @@
 
 		<div class="uk-card uk-card-default uk-grid-collapse uk-child-width-1-2@s uk-child-width-1-1@m uk-child-width-1-2@xl uk-margin" uk-grid>
 			<div class="uk-card-media-left uk-cover-container">
-				<?php if(Summoner::ifset($entry['fields'], 'coverimage')) { ?>
+				<?php if(isset($entry['fields']['coverimage'])) { ?>
 				<a href="index.php?p=entry&collection=<?php echo $k ?>&id=<?php echo $entryK; ?>">
 				<img src="<?php echo PATH_WEB_STORAGE.'/'.$k.'/'.$entryK.'/'.$entry['fields']['coverimage']['value']; ?>"
 					 alt="<?php echo $entry['fields']['coverimage']['displayname']; ?>" uk-cover>
@@ -32,11 +32,11 @@
 			</div>
 			<div>
 				<div class="uk-card-body uk-visible@l">
-					<?php if(Summoner::ifset($entry['fields'], 'title')) { ?>
+					<?php if(isset($entry['fields']['title'])) { ?>
 					<h3 class="uk-card-title"><?php echo $entry['fields']['title']['value']; ?></h3>
 					<?php } ?>
 
-					<?php if(Summoner::ifset($entry['fields'], array('description','value'))) { ?>
+					<?php if(isset($entry['fields']['description']['value'])) { ?>
 					<p><?php echo $entry['fields']['description']['value']; ?></p>
 					<?php } ?>
 				</div>
diff --git a/webclient/view/default/entry/entry.html b/webclient/view/default/entry/entry.html
index eeda4fc..05855b1 100644
--- a/webclient/view/default/entry/entry.html
+++ b/webclient/view/default/entry/entry.html
@@ -1,9 +1,9 @@
-<h3 class="uk-h3"><a href="index.php?p=collections&collection=<?php echo Summoner::ifset($TemplateData['loadedCollection'], 'id'); ?>"><?php echo Summoner::ifset($TemplateData['loadedCollection'], 'name'); ?></a></h3>
+<h3 class="uk-h3"><a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>"><?php echo $TemplateData['loadedCollection']['name'] ?? ''; ?></a></h3>
 <div class="uk-grid-small uk-grid-row-small uk-grid-row-small" uk-grid>
 	<div class="uk-width-1-2@l">
 		<article class="uk-article">
 			<?php if($TemplateData['showEdit'] === true) { ?>
-			<p class="uk-article-meta"><a href="index.php?p=manageentry&collection=<?php echo Summoner::ifset($TemplateData['loadedCollection'], 'id'); ?>&id=<?php echo $TemplateData['entry']['id']; ?>">EDIT</a></p>
+			<p class="uk-article-meta"><a href="index.php?p=manageentry&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>&id=<?php echo $TemplateData['entry']['id']; ?>">EDIT</a></p>
 			<?php
 			}
 
@@ -27,7 +27,6 @@
 				}
 			}
 			?>
-
 		</article>
 	</div>
 	<div class="uk-width-1-2@l">
diff --git a/webclient/view/default/entry/field-date.html b/webclient/view/default/entry/field-date.html
index 7a6769c..d2965fa 100644
--- a/webclient/view/default/entry/field-date.html
+++ b/webclient/view/default/entry/field-date.html
@@ -1,4 +1,4 @@
 <p data-field-name="date" data-field-id="<?php echo $field['identifier']; ?>">
 	<span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span>
-	<a href="index.php?p=collections&collection='.$TemplateData['loadedCollection']['id'].'&fid='.$field['identifier'].'&fv='.urlencode(Summoner::ifset($field, 'value')).'"><?php echo Summoner::ifset($field, 'value'); ?></a>
+	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode($field['value'] ?? ''); ?>"><?php echo $field['value'] ?? ''; ?></a>
 </p>
diff --git a/webclient/view/default/entry/field-number.html b/webclient/view/default/entry/field-number.html
index eb20d83..ff3e8de 100644
--- a/webclient/view/default/entry/field-number.html
+++ b/webclient/view/default/entry/field-number.html
@@ -1,4 +1,4 @@
 <p data-field-name="number" data-field-id="<?php echo $field['identifier']; ?>">
 	<span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span>
-	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode(Summoner::ifset($field, 'value')); ?>"><?php echo Summoner::ifset($field, 'value'); ?></a>
+	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode($field['value'] ?? ''); ?>"><?php echo $field['value'] ?? ''; ?></a>
 </p>
diff --git a/webclient/view/default/entry/field-selection.html b/webclient/view/default/entry/field-selection.html
index 4f149de..916b43c 100644
--- a/webclient/view/default/entry/field-selection.html
+++ b/webclient/view/default/entry/field-selection.html
@@ -1,4 +1,4 @@
 <p data-field-name="selection" data-field-id="<?php echo $field['identifier']; ?>">
 	<span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span>
-	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode(Summoner::ifset($field, 'value')); ?>"><?php echo Summoner::ifset($field, 'value'); ?></a>
+	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode($field['value'] ?? ''); ?>"><?php echo $field['value'] ?? ''; ?></a>
 </p>
diff --git a/webclient/view/default/entry/field-text-title.html b/webclient/view/default/entry/field-text-title.html
index 216fac6..6b1a321 100644
--- a/webclient/view/default/entry/field-text-title.html
+++ b/webclient/view/default/entry/field-text-title.html
@@ -1 +1 @@
-<h1 class="uk-article-title" data-field-name="text-title" data-field-id="<?php echo $field['identifier']; ?>"><?php echo Summoner::ifset($field, 'value'); ?></h1>
+<h1 class="uk-article-title" data-field-name="text-title" data-field-id="<?php echo $field['identifier']; ?>"><?php echo $field['value'] ?? ''; ?></h1>
diff --git a/webclient/view/default/entry/field-text.html b/webclient/view/default/entry/field-text.html
index 9469378..8ff4830 100644
--- a/webclient/view/default/entry/field-text.html
+++ b/webclient/view/default/entry/field-text.html
@@ -1 +1 @@
-<p data-field-name="text" data-field-id="<?php echo $field['identifier']; ?>"><span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span> <?php echo nl2br(Summoner::ifset($field, 'value')); ?></p>
+<p data-field-name="text" data-field-id="<?php echo $field['identifier']; ?>"><span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span> <?php echo nl2br($field['value'] ?? ''); ?></p>
diff --git a/webclient/view/default/entry/field-text3-description.html b/webclient/view/default/entry/field-text3-description.html
index b5def6a..e556e1e 100644
--- a/webclient/view/default/entry/field-text3-description.html
+++ b/webclient/view/default/entry/field-text3-description.html
@@ -1 +1 @@
-<p data-field-name="text3-description" class="uk-text-lead" data-field-id="<?php echo $field['identifier']; ?>"><?php echo nl2br(Summoner::ifset($field, 'value')); ?></p>
+<p data-field-name="text3-description" class="uk-text-lead" data-field-id="<?php echo $field['identifier']; ?>"><?php echo nl2br($field['value'] ?? ''); ?></p>
diff --git a/webclient/view/default/entry/field-text3.html b/webclient/view/default/entry/field-text3.html
index b8412e7..e99b7a0 100644
--- a/webclient/view/default/entry/field-text3.html
+++ b/webclient/view/default/entry/field-text3.html
@@ -1 +1 @@
-<p data-field-name="text3" data-field-id="<?php echo $field['identifier']; ?>"><span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span> <?php echo nl2br(Summoner::ifset($field, 'value')); ?></p>
+<p data-field-name="text3" data-field-id="<?php echo $field['identifier']; ?>"><span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span> <?php echo nl2br($field['value'] ?? ''); ?></p>
diff --git a/webclient/view/default/entry/field-textarea-content.html b/webclient/view/default/entry/field-textarea-content.html
index 75e8432..d179791 100644
--- a/webclient/view/default/entry/field-textarea-content.html
+++ b/webclient/view/default/entry/field-textarea-content.html
@@ -1 +1 @@
-<p data-field-name="textarea-content" data-field-id="<?php echo $field['identifier']; ?>" class="uk-dropcap"><?php echo nl2br(Summoner::ifset($field, 'value')); ?></p>
+<p data-field-name="textarea-content" data-field-id="<?php echo $field['identifier']; ?>" class="uk-dropcap"><?php echo nl2br($field['value'] ?? ''); ?></p>
diff --git a/webclient/view/default/entry/field-textarea.html b/webclient/view/default/entry/field-textarea.html
index 49638c4..b86ce4d 100644
--- a/webclient/view/default/entry/field-textarea.html
+++ b/webclient/view/default/entry/field-textarea.html
@@ -1 +1 @@
-<p data-field-name="textarea" data-field-id="<?php echo $field['identifier']; ?>"><span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span> <?php echo nl2br(Summoner::ifset($field, 'value')); ?></p>
+<p data-field-name="textarea" data-field-id="<?php echo $field['identifier']; ?>"><span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span> <?php echo nl2br($field['value'] ?? ''); ?></p>
diff --git a/webclient/view/default/entry/field-upload-coverimage.html b/webclient/view/default/entry/field-upload-coverimage.html
index e4f2cec..a2ea3dc 100644
--- a/webclient/view/default/entry/field-upload-coverimage.html
+++ b/webclient/view/default/entry/field-upload-coverimage.html
@@ -1,6 +1,6 @@
 <div class="uk-margin" data-field-name="upload-coverimage">
-	<img src="<?php echo $TemplateData['storagePath'].'/'.Summoner::ifset($field, 'value'); ?>"
-		 title="<?php echo Summoner::ifset($field, 'value'); ?>"
+	<img src="<?php echo $TemplateData['storagePath'].'/'.$field['value'] ?? ''; ?>"
+		 title="<?php echo $field['value'] ?? ''; ?>"
 		 width=""
 	/>
 </div>
diff --git a/webclient/view/default/entry/field-upload.html b/webclient/view/default/entry/field-upload.html
index ddbea47..98a355e 100644
--- a/webclient/view/default/entry/field-upload.html
+++ b/webclient/view/default/entry/field-upload.html
@@ -1,3 +1,3 @@
 <p data-field-name="upload" data-field-id="<?php echo $field['identifier']; ?>"><span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span>
-	<a href="<?php echo $TemplateData['storagePath'].'/'.Summoner::ifset($field, 'value'); ?>" target="_blank"><?php echo Summoner::ifset($field, 'value'); ?></a>
+	<a href="<?php echo $TemplateData['storagePath'].'/'.$field['value'] ?? ''; ?>" target="_blank"><?php echo $field['value'] ?? ''; ?></a>
 </p>
diff --git a/webclient/view/default/entry/field-year.html b/webclient/view/default/entry/field-year.html
index c3dfbf5..ed98f65 100644
--- a/webclient/view/default/entry/field-year.html
+++ b/webclient/view/default/entry/field-year.html
@@ -1,4 +1,4 @@
 <p data-field-name="year" data-field-id="<?php echo $field['identifier']; ?>">
 	<span class="uk-text-muted"><?php echo $field['displayname']; ?>:</span>
-	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode(Summoner::ifset($field, 'value')); ?>"><?php echo Summoner::ifset($field, 'value'); ?></a>
+	<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $field['identifier']; ?>&fv=<?php echo urlencode($field['value'] ?? ''); ?>"><?php echo $field['value'] ?? ''; ?></a>
 </p>
diff --git a/webclient/view/default/managecollectionfields/managecollectionfields.html b/webclient/view/default/managecollectionfields/managecollectionfields.html
index 3b3ed89..237e9eb 100644
--- a/webclient/view/default/managecollectionfields/managecollectionfields.html
+++ b/webclient/view/default/managecollectionfields/managecollectionfields.html
@@ -21,7 +21,7 @@
 
 		<form class="uk-form-horizontal uk-margin-small" method="post" onsubmit="return saveOrderAndSubmit()">
 			<input type="hidden" name="fdata[fieldSortString]" id="fieldSort"
-			   value="<?php echo Summoner::ifset($TemplateData['editData'], 'fieldSortString'); ?>">
+			   value="<?php echo $TemplateData['editData']['fieldSortString'] ?? ''; ?>">
 			<div class="uk-margin">
 				<button class="uk-button uk-button-primary" type="submit" name="submitForm">
 					Save
diff --git a/webclient/view/default/managecolletions/managecolletions.html b/webclient/view/default/managecolletions/managecolletions.html
index a354667..5823b61 100644
--- a/webclient/view/default/managecolletions/managecolletions.html
+++ b/webclient/view/default/managecolletions/managecolletions.html
@@ -13,14 +13,14 @@
 				<div class="uk-form-controls">
 					<input class="uk-input" id="name" type="text" autocomplete="off" name="fdata[name]"
 						placeholder="Unique name. No special chars."
-						value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
+						value="<?php echo $TemplateData['editData']['name'] ?? ''; ?>">
 				</div>
 			</div>
 			<div class="uk-margin">
 				<label class="uk-form-label" for="description">Description</label>
 				<div class="uk-form-controls">
 					<input class="uk-input" id="description" type="text" autocomplete="off" name="fdata[description]"
-						   value="<?php echo Summoner::ifset($TemplateData['editData'], 'description'); ?>">
+						   value="<?php echo $TemplateData['editData']['description'] ?? ''; ?>">
 				</div>
 			</div>
 			<div class="uk-margin">
@@ -88,7 +88,7 @@
 					<select class="uk-select" id="advancedSearchTableFields" name="fdata[advancedSearchTableFields][]" multiple="multiple" size="5">
 						<?php foreach($TemplateData['existingFields'] as $k=>$v) { ?>
 						<option value="<?php echo $v['id']; ?>"
-						<?php if(Summoner::ifset($TemplateData['editData']['advancedSearchTableFields'], $v['id'])) echo 'selected'; ?>
+						<?php if(isset($TemplateData['editData']['advancedSearchTableFields'][$v['id']])) echo 'selected'; ?>
 						><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
 						<?php } ?>
 					</select>
@@ -105,7 +105,7 @@
 						<option value="">None</option>
 						<?php foreach($TemplateData['toolSelection'] as $k=>$v) { ?>
 						<option value="<?php echo $k; ?>"
-						<?php if(Summoner::ifset($TemplateData['editData']['tool'],$k)) echo 'selected'; ?>
+						<?php if(isset($TemplateData['editData']['tool'][$k])) echo 'selected'; ?>
 						><?php echo $v['name']; ?> (<?php echo $v['description']; ?>)</option>
 						<?php } ?>
 					</select>
@@ -176,7 +176,7 @@
 					</table>
 				</div>
 			</div>
-			<?php if(Summoner::ifset($TemplateData['editData'], 'name')) { ?>
+			<?php if(isset($TemplateData['editData']['name'])) { ?>
 			<div class="uk-margin">
 				<div class="uk-form-label">Update entry with collection rights</div>
 				<div class="uk-form-controls uk-form-controls-text">
diff --git a/webclient/view/default/manageentry/field-hidden.html b/webclient/view/default/manageentry/field-hidden.html
index 3a79532..3ba1508 100644
--- a/webclient/view/default/manageentry/field-hidden.html
+++ b/webclient/view/default/manageentry/field-hidden.html
@@ -1,4 +1,4 @@
 <input type="hidden" id="<?php echo $field['identifier']; ?>" autocomplete="off"
        name="fdata[<?php echo $field['identifier']; ?>]"
-       value="<?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?>"
+       value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
 >
diff --git a/webclient/view/default/manageentry/field-lookupmultiple.html b/webclient/view/default/manageentry/field-lookupmultiple.html
index d4dbb38..88e86b2 100644
--- a/webclient/view/default/manageentry/field-lookupmultiple.html
+++ b/webclient/view/default/manageentry/field-lookupmultiple.html
@@ -1,6 +1,6 @@
 <?php
 $existingFieldValue = array();
-if(Summoner::ifset($TemplateData['editData'], $field['identifier'])) {
+if(isset($TemplateData['editData'][$field['identifier']])) {
 	$existingFieldValue = $TemplateData['editData'][$field['identifier']];
 }
 ?>
@@ -27,7 +27,7 @@ if(Summoner::ifset($TemplateData['editData'], $field['identifier'])) {
 			onkeypress="addTag(event,'<?php echo $field['identifier']; ?>','<?php echo $field['inputValidation']; ?>')"
 			placeholder="Write and press enter."
 		>
-		<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+		<?php if(isset($field['bulkedit'])) { ?>
 		<select class="uk-select" name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 			<option value="">Select bulk edit option</option>
 			<option value="add">Add</option>
diff --git a/webclient/view/default/manageentry/field-number.html b/webclient/view/default/manageentry/field-number.html
index 306f0e6..cd92132 100644
--- a/webclient/view/default/manageentry/field-number.html
+++ b/webclient/view/default/manageentry/field-number.html
@@ -4,9 +4,9 @@
 		<input class="uk-input" id="<?php echo $field['identifier']; ?>" type="number"
 		       autocomplete="off" maxlength="10"
 		       name="fdata[<?php echo $field['identifier']; ?>]"
-		       value="<?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?>"
+		       value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
 		>
-		<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+		<?php if(isset($field['bulkedit'])) { ?>
 		<select class="uk-select" name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 			<option value="">Select bulk edit option</option>
 			<option value="replace">Replace</option>
diff --git a/webclient/view/default/manageentry/field-selection.html b/webclient/view/default/manageentry/field-selection.html
index 8618bd3..ed5a202 100644
--- a/webclient/view/default/manageentry/field-selection.html
+++ b/webclient/view/default/manageentry/field-selection.html
@@ -9,7 +9,7 @@
 			><?php echo $v; ?></option>
 			<?php } ?>
 		</select>
-		<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+		<?php if(isset($field['bulkedit'])) { ?>
 		<select class="uk-select" name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 			<option value="">Select bulk edit option</option>
 			<option value="replace">Replace</option>
diff --git a/webclient/view/default/manageentry/field-text.html b/webclient/view/default/manageentry/field-text.html
index da37bd5..db065a0 100644
--- a/webclient/view/default/manageentry/field-text.html
+++ b/webclient/view/default/manageentry/field-text.html
@@ -3,11 +3,11 @@
 	<div class="uk-form-controls">
 		<input class="uk-input" id="<?php echo $field['identifier']; ?>" type="text" autocomplete="off"
 		   name="fdata[<?php echo $field['identifier']; ?>]"
-		   value="<?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?>"
+		   value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
 	       maxlength="128"
 		>
-		<small id="<?php echo $field['identifier']; ?>_counter" class="uk-float-right"><?php echo 128-strlen(Summoner::ifset($TemplateData['editData'], $field['identifier'])); ?></small>
-		<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+		<small id="<?php echo $field['identifier']; ?>_counter" class="uk-float-right"><?php echo 128-strlen($TemplateData['editData'][$field['identifier']] ?? ''); ?></small>
+		<?php if(isset($field['bulkedit'])) { ?>
 		<select class="uk-select" name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 			<option value="">Select bulk edit option</option>
 			<option value="add">Add</option>
diff --git a/webclient/view/default/manageentry/field-text3.html b/webclient/view/default/manageentry/field-text3.html
index 268d615..6033a4a 100644
--- a/webclient/view/default/manageentry/field-text3.html
+++ b/webclient/view/default/manageentry/field-text3.html
@@ -4,9 +4,9 @@
 		<textarea class="uk-textarea" autocomplete="off"
 				  id="<?php echo $field['identifier']; ?>"
 				  rows="3" maxlength="255"
-				  name="fdata[<?php echo $field['identifier']; ?>]"><?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?></textarea>
-		<small id="<?php echo $field['identifier']; ?>_counter" class="uk-float-right"><?php echo 255-strlen(Summoner::ifset($TemplateData['editData'], $field['identifier'])); ?></small>
-		<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+				  name="fdata[<?php echo $field['identifier']; ?>]"><?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?></textarea>
+		<small id="<?php echo $field['identifier']; ?>_counter" class="uk-float-right"><?php echo 255-strlen($TemplateData['editData'][$field['identifier']] ??  ''); ?></small>
+		<?php if(isset($field['bulkedit'])) { ?>
 		<select class="uk-select" name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 			<option value="">Select bulk edit option</option>
 			<option value="add">Add</option>
diff --git a/webclient/view/default/manageentry/field-textarea.html b/webclient/view/default/manageentry/field-textarea.html
index d5da701..8bf7dad 100644
--- a/webclient/view/default/manageentry/field-textarea.html
+++ b/webclient/view/default/manageentry/field-textarea.html
@@ -4,8 +4,8 @@
 		<textarea class="uk-textarea" autocomplete="off"
 			id="<?php echo $field['identifier']; ?>"
 	        rows="10"
-			name="fdata[<?php echo $field['identifier']; ?>]"><?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?></textarea>
-		<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+			name="fdata[<?php echo $field['identifier']; ?>]"><?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?></textarea>
+		<?php if(isset($field['bulkedit'])) { ?>
 		<select class="uk-select" name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 			<option value="">Select bulk edit option</option>
 			<option value="add">Add</option>
diff --git a/webclient/view/default/manageentry/field-upload.html b/webclient/view/default/manageentry/field-upload.html
index 6eee5e0..f5dca9d 100644
--- a/webclient/view/default/manageentry/field-upload.html
+++ b/webclient/view/default/manageentry/field-upload.html
@@ -4,10 +4,10 @@
 		<input type="file" id="<?php echo $field['identifier']; ?>" multiple="false"
 		   name="fdata[<?php echo $field['identifier']; ?>]"
 		>
-		<?php if(Summoner::ifset($TemplateData['editData'], $field['identifier'])) { ?>
+		<?php if(isset($TemplateData['editData'][$field['identifier']])) { ?>
 		<div uk-lightbox>
-			<?php echo '<a href="'.$TemplateData['storagePath'].'/'.Summoner::ifset($TemplateData['editData'], $field['identifier']).'">'.Summoner::ifset($TemplateData['editData'], $field['identifier']).'</a>'; ?>
-			<input type="checkbox" value="<?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?>"
+			<?php echo '<a href="'.$TemplateData['storagePath'].'/'.$TemplateData['editData'][$field['identifier']] ?? ''.'">'.$TemplateData['editData'][$field['identifier']] ?? ''.'</a>'; ?>
+			<input type="checkbox" value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
 				   name="fdata[<?php echo $field['identifier']; ?>_delete]"
 				   title="Delete"
 			/> Delete
diff --git a/webclient/view/default/manageentry/field-year.html b/webclient/view/default/manageentry/field-year.html
index 19882b0..11143f9 100644
--- a/webclient/view/default/manageentry/field-year.html
+++ b/webclient/view/default/manageentry/field-year.html
@@ -4,9 +4,9 @@
 		<input class="uk-input" id="<?php echo $field['identifier']; ?>" type="number" autocomplete="off"
 			placeholder="YYYY" min="0000" max="9999"
 			name="fdata[<?php echo $field['identifier']; ?>]"
-			value="<?php echo Summoner::ifset($TemplateData['editData'], $field['identifier']); ?>"
+			value="<?php echo $TemplateData['editData'][$field['identifier']] ?? ''; ?>"
 		>
-		<?php if(Summoner::ifset($field,'bulkedit')) { ?>
+		<?php if(isset($field['bulkedit'])) { ?>
 		<select class="uk-select" name="fdata[additionalEditOption][<?php echo $field['identifier']; ?>]">
 			<option value="">Select bulk edit option</option>
 			<option value="replace">Replace</option>
diff --git a/webclient/view/default/managegroups/managegroups.html b/webclient/view/default/managegroups/managegroups.html
index 94c08ad..8ffadaf 100644
--- a/webclient/view/default/managegroups/managegroups.html
+++ b/webclient/view/default/managegroups/managegroups.html
@@ -7,18 +7,18 @@
 				<label class="uk-form-label" for="name">Name *</label>
 				<div class="uk-form-controls">
 					<input class="uk-input" id="name" type="text" autocomplete="off" name="fdata[name]"
-					       value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
+					       value="<?php echo $TemplateData['editData']['name'] ?? ''; ?>">
 				</div>
 			</div>
 			<div class="uk-margin">
 				<label class="uk-form-label" for="description">Description *</label>
 				<div class="uk-form-controls">
 					<input class="uk-input" id="description" type="text" autocomplete="off" name="fdata[description]"
-					       value="<?php echo Summoner::ifset($TemplateData['editData'], 'description'); ?>">
+					       value="<?php echo $TemplateData['editData']['description'] ?? ''; ?>">
 				</div>
 			</div>
 
-			<?php if(Summoner::ifset($TemplateData['editData'], 'name') && Summoner::ifsetValue($TemplateData['editData'], 'protected', '0')) { ?>
+			<?php if(isset($TemplateData['editData']['name']) && Summoner::ifsetValue($TemplateData['editData'], 'protected', '0')) { ?>
 			<div class="uk-margin">
 				<div class="uk-form-label">Delete <span uk-icon="warning"></span></div>
 				<div class="uk-form-controls uk-form-controls-text">
diff --git a/webclient/view/default/manageusers/manageusers.html b/webclient/view/default/manageusers/manageusers.html
index f8dc2fb..b3c6138 100644
--- a/webclient/view/default/manageusers/manageusers.html
+++ b/webclient/view/default/manageusers/manageusers.html
@@ -7,14 +7,14 @@
 				<label class="uk-form-label" for="username">Username *</label>
 				<div class="uk-form-controls">
 					<input class="uk-input" id="username" type="text" autocomplete="off" name="fdata[username]"
-						value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
+						value="<?php echo $TemplateData['editData']['name'] ?? ''; ?>">
 				</div>
 			</div>
 			<div class="uk-margin">
 				<label class="uk-form-label" for="login">Login *</label>
 				<div class="uk-form-controls">
 					<input class="uk-input" id="login" type="text" autocomplete="off" name="fdata[login]"
-						value="<?php echo Summoner::ifset($TemplateData['editData'], 'login'); ?>">
+						value="<?php echo $TemplateData['editData']['login'] ?? ''; ?>">
 				</div>
 			</div>
 			<div class="uk-margin">
@@ -44,7 +44,7 @@
 						<option value="">None</option>
 						<?php foreach($TemplateData['existingGroups'] as $k=>$v) { ?>
 						<option value="<?php echo $k; ?>"
-						<?php if(Summoner::ifset($TemplateData['editData']['groups'],$k)) echo 'selected'; ?>
+						<?php if(isset($TemplateData['editData']['groups'][$k])) echo 'selected'; ?>
 						><?php echo $v['name']; ?> (<?php echo $v['description']; ?>)</option>
 						<?php } ?>
 					</select>
@@ -55,11 +55,11 @@
 				<div class="uk-form-controls uk-form-controls-text">
 					<label>
 						<input class="uk-checkbox" type="checkbox" name="fdata[active]" value="1"
-							<?php if(Summoner::ifset($TemplateData['editData'], 'active')) echo "checked"; ?>>
+							<?php if(isset($TemplateData['editData']['active'])) echo "checked"; ?>>
 					</label>
 				</div>
 			</div>
-			<?php if(Summoner::ifset($TemplateData['editData'], 'name') && Summoner::ifsetValue($TemplateData['editData'], 'protected', '0')) { ?>
+			<?php if(isset($TemplateData['editData']['name']) && Summoner::ifsetValue($TemplateData['editData'], 'protected', '0')) { ?>
 			<div class="uk-margin">
 				<div class="uk-form-label">Delete <span uk-icon="warning"></span></div>
 				<div class="uk-form-controls uk-form-controls-text">
@@ -75,8 +75,8 @@
 				<div class="uk-form-controls uk-form-controls-text">
 					<label>
 						<input class="uk-checkbox" type="checkbox" name="fdata[refreshApiToken]" value="1"><br />
-						Valid until: <?php echo Summoner::ifset($TemplateData['editData'], 'apiTokenValidDate'); ?><br />
-						<?php echo Summoner::ifset($TemplateData['editData'], 'apiToken'); ?>
+						Valid until: <?php echo $TemplateData['editData']['apiTokenValidDate'] ?? ''; ?><br />
+						<?php echo $TemplateData['editData']['apiToken'] ?? ''; ?>
 					</label>
 				</div>
 			</div>
diff --git a/webclient/view/default/manageusers/manageusers.php b/webclient/view/default/manageusers/manageusers.php
index 0264a23..547ad7f 100644
--- a/webclient/view/default/manageusers/manageusers.php
+++ b/webclient/view/default/manageusers/manageusers.php
@@ -23,7 +23,6 @@ $Possessed = new Possessed($DB, $Doomguy);
 $TemplateData['existingGroups'] = $Possessed->getGroups();
 $TemplateData['existingUsers'] = $Possessed->getUsers();
 $TemplateData['editData'] = array();
-$TemplateData['editData']['groups'] = array();
 $TemplateData['pageTitle'] = 'Manage users';
 
 $_id = '';
diff --git a/webclient/view/default/profile/profile.html b/webclient/view/default/profile/profile.html
index 4fd1a80..b96678c 100644
--- a/webclient/view/default/profile/profile.html
+++ b/webclient/view/default/profile/profile.html
@@ -6,7 +6,7 @@
 				<label class="uk-form-label" for="username">Username</label>
 				<div class="uk-form-controls">
 					<input class="uk-input" id="username" type="text" autocomplete="off" name="fdata[username]"
-					       value="<?php echo Summoner::ifset($TemplateData['editData'], 'name'); ?>">
+					       value="<?php echo $TemplateData['editData']['name'] ?? ''; ?>">
 				</div>
 			</div>
 			<div class="uk-margin">
@@ -19,14 +19,14 @@
 				<label class="uk-form-label" for="group">Main group</label>
 				<div class="uk-form-controls">
 					<input class="uk-input" id="group" type="text" name="fdata[group]" disabled
-					       value="<?php echo Summoner::ifset($TemplateData['editData'], 'baseGroupName'); ?>"
+					       value="<?php echo $TemplateData['editData']['baseGroupName'] ?? ''; ?>"
 					>
 				</div>
 			</div>
 			<div class="uk-margin">
 				<label class="uk-form-label" for="additionalGroups">Additional groups</label>
 				<div class="uk-form-controls">
-					<select class="uk-select" multiple size="5" id="additionalGroups" name="fdata[additionalGroups]" disabled>
+					<select class="uk-select" multiple="multiple" size="5" id="additionalGroups" name="fdata[additionalGroups]" disabled>
 					<?php
 					foreach($TemplateData['editData']['groups'] as $k=>$v) {
 						if($v['groupName'] !== $TemplateData['editData']['baseGroupName']) {
@@ -34,7 +34,6 @@
 						}
 					}
 					?>
-
 					</select>
 				</div>
 			</div>
@@ -43,8 +42,8 @@
 				<div class="uk-form-controls uk-form-controls-text">
 					<label>
 						<input class="uk-checkbox" type="checkbox" name="fdata[refreshApiToken]" value="1"><br />
-						Valid until: <?php echo Summoner::ifset($TemplateData['editData'], 'apiTokenValidDate'); ?><br />
-						Key: <?php echo Summoner::ifset($TemplateData['editData'], 'apiToken'); ?>
+						Valid until: <?php echo $TemplateData['editData']['apiTokenValidDate'] ?? ''; ?><br />
+						Key: <?php echo $TemplateData['editData']['apiToken'] ?? ''; ?>
 					</label>
 				</div>
 			</div>
diff --git a/webclient/view/default/tags/tags.html b/webclient/view/default/tags/tags.html
index cdb01bb..8d674ba 100644
--- a/webclient/view/default/tags/tags.html
+++ b/webclient/view/default/tags/tags.html
@@ -1,7 +1,7 @@
 <div class="uk-grid-small uk-grid-row-small" uk-grid>
 	<div class="uk-width-1-2@l">
 	<?php if(!empty($TemplateData['tags'])) { ?>
-		<h3 class="uk-h3">Tags for: <a href="index.php?p=collections&collection=<?php echo Summoner::ifset($TemplateData['loadedCollection'], 'id'); ?>"><?php echo Summoner::ifset($TemplateData['loadedCollection'], 'name'); ?></a></h3>
+		<h3 class="uk-h3">Tags for: <a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>"><?php echo $TemplateData['loadedCollection']['name'] ?? ''; ?></a></h3>
 
 		<?php if(!empty($TemplateData['search'])) { ?>
 		<div uk-alert id="searchNotice">
diff --git a/webclient/view/default/tool/tool-googlebooks.html b/webclient/view/default/tool/tool-googlebooks.html
index 92228be..ef431a1 100644
--- a/webclient/view/default/tool/tool-googlebooks.html
+++ b/webclient/view/default/tool/tool-googlebooks.html
@@ -7,7 +7,7 @@
 		<div class="uk-form-controls">
 			<input class="uk-input" id="search" type="text" autocomplete="off"
 			       name="fdata[search]"
-			       value="<?php echo Summoner::ifset($TemplateData['editEntry'], 'isbn'); ?>"
+			       value="<?php echo $TemplateData['editEntry']['isbn'] ?? ''; ?>"
 			>
 		</div>
 		<div class="uk-margin">
diff --git a/webclient/view/default/tool/tool-imdbweb.html b/webclient/view/default/tool/tool-imdbweb.html
index 6ac167e..8d63a57 100644
--- a/webclient/view/default/tool/tool-imdbweb.html
+++ b/webclient/view/default/tool/tool-imdbweb.html
@@ -7,7 +7,7 @@
 		<div class="uk-form-controls">
 			<input class="uk-input" id="search" type="text" autocomplete="off"
 				   name="fdata[search]"
-				   value="<?php echo Summoner::ifset($TemplateData['editEntry'], 'title'); ?>"
+				   value="<?php echo $TemplateData['editEntry']['title'] ? ''; ?>"
 			>
 		</div>
 		<div class="uk-margin">
diff --git a/webclient/view/default/tool/tool-musicbrainz.html b/webclient/view/default/tool/tool-musicbrainz.html
index cd1eaf3..eff6d90 100644
--- a/webclient/view/default/tool/tool-musicbrainz.html
+++ b/webclient/view/default/tool/tool-musicbrainz.html
@@ -7,7 +7,7 @@
 		<div class="uk-form-controls">
 			<input class="uk-input" id="artist" type="text" autocomplete="off"
 			       name="fdata[artist]"
-			       value="<?php echo Summoner::ifset($TemplateData['editEntry'], 'artist'); ?>"
+			       value="<?php echo $TemplateData['editEntry']['artist'] ?? ''; ?>"
 			>
 		</div>
 	</div>
@@ -16,7 +16,7 @@
 		<div class="uk-form-controls">
 			<input class="uk-input" id="album" type="text" autocomplete="off"
 			       name="fdata[album]"
-			       value="<?php echo Summoner::ifset($TemplateData['editEntry'], 'title'); ?>"
+			       value="<?php echo $TemplateData['editEntry']['title'] ?? ''; ?>"
 			>
 		</div>
 	</div>
diff --git a/webclient/view/default/tool/tool.html b/webclient/view/default/tool/tool.html
index 591cf0a..f4127f2 100644
--- a/webclient/view/default/tool/tool.html
+++ b/webclient/view/default/tool/tool.html
@@ -1,7 +1,7 @@
 <h3 class="uk-h3">Using <?php echo $TemplateData['tool']['name']; ?> with collection: <?php echo $TemplateData['collection']['name']; ?></h3>
 <?php if(!empty($TemplateData['editEntry'])) { ?>
 <p><span uk-icon="arrow-left"></span>
-	<a href="index.php?p=manageentry&collection=<?php echo $TemplateData['collection']['id']; ?>&id=<?php echo $TemplateData['editEntry']['id']; ?>"><?php echo Summoner::ifset($TemplateData['editEntry'], 'title'); ?></a>
+	<a href="index.php?p=manageentry&collection=<?php echo $TemplateData['collection']['id']; ?>&id=<?php echo $TemplateData['editEntry']['id']; ?>"><?php echo $TemplateData['editEntry']['title'] ?? ''; ?></a>
 </p>
 <?php } ?>
 
-- 
2.39.5