diff --git a/htdocs/themes/xswatch4/modules/wggallery/blocks/wggallery_block_albums_default.tpl b/htdocs/themes/xswatch4/modules/wggallery/blocks/wggallery_block_albums_default.tpl
index dccde9dc5..e0488d794 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/blocks/wggallery_block_albums_default.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/blocks/wggallery_block_albums_default.tpl
@@ -170,10 +170,10 @@
                 <{/if}>
             <{/if}>
         </div>
-        <{if $album.linebreak}>
+        <{if $album.linebreak|default:false}>
             <div class='clear'>&nbsp;</div>
         <{/if}>
-        <{if $album.linebreak}></div><{/if}>
+        <{if $album.linebreak|default:false}></div><{/if}>
     <{/foreach}>
     <div class="clear"></div>
     <{if isset($show_more_albums)}>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_album_images.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_album_images.tpl
index 6be417d32..54d7298c5 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_album_images.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_album_images.tpl
@@ -64,12 +64,12 @@
                 <div class="col-12 col-md-6">
                     <div class="row">
                     <{foreach item=image from=$images|default:null name=fe_image}>
-                        <{if $image.alb_name}>
+                        <{if $image.alb_name|default:''}>
                             <div class="clear"></div>
-                            <div class="selimages col-12 col-md-12"><h5 class="modal-title" style="width:100%"><{$image.alb_name}></h5></div>
+                            <div class="selimages col-12 col-md-12"><h5 class="modal-title" style="width:100%"><{$image.alb_name|default:''}></h5></div>
                         <{/if}>
                         <div class="selimages col-6 col-md-3">
-                            <input id="<{$image.id}>_image" class="imgSelect1 img-fluid wgg-album-img <{if $image.selected}>wgg-modal-selected<{/if}>" type="image" src="<{$image.thumb}>"  preview="<{$image.medium}>" alt="<{$image.title}>" style="padding:3px;" value="<{$image.name}>">
+                            <input id="<{$image.id}>_image" class="imgSelect1 img-fluid wgg-album-img <{if $image.selected|default:false}>wgg-modal-selected<{/if}>" type="image" src="<{$image.thumb}>"  preview="<{$image.medium}>" alt="<{$image.title}>" style="padding:3px;" value="<{$image.name}>">
                         </div>
                         <{if $image.counter % 3 == 0}>
                             <div class="clear"></div>
@@ -292,7 +292,7 @@
                 </div>
                 <div class="modal-body">
                     <{foreach item=image from=$images|default:null}>
-                    <{if $image.alb_name}><h4 class="modal-title"><{$image.alb_name}></h4><{/if}>
+                    <{if $image.alb_name|default:''}><h4 class="modal-title"><{$image.alb_name|default:''}></h4><{/if}>
                     <input class="imgGrid<{$m}>" type="image" src="<{$image.thumb}>" alt="<{$image.title}>"
                        style="padding:3px;max-height:150px;max-width:200px" value="<{$image.name}>" onclick="selectGridImage(this, <{$m}>)">
                     <{/foreach}>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_1.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_1.tpl
index 5973dde1e..d60dd81d1 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_1.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_1.tpl
@@ -32,7 +32,7 @@
                 <a disabled class='disabled btn btn-secondary wgg-btn' title='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>'>
                     <span class='wgg-btn'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGES_COUNT}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_COUNT}>'><{$smarty.const._CO_WGGALLERY_ALBUM_NO_IMAGES}></span></a>
             <{/if}>
-            <{if $album.edit}>
+            <{if $album.edit|default:false}>
                 <a class='btn btn-secondary wgg-btn' href='albums.php?op=edit&amp;alb_id=<{$album.id}>' title='<{$smarty.const._EDIT}>'>
                     <span class = "wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>edit.png' alt='<{$smarty.const._EDIT}>'></span><{if isset($displayButtonText)}><{$smarty.const._EDIT}><{/if}></a>
                 <a class='btn btn-secondary wgg-btn' href='albums.php?op=delete&amp;alb_id=<{$album.id}>' title='<{$smarty.const._DELETE}>'>
@@ -42,7 +42,7 @@
                 <a class='btn btn-secondary wgg-btn' href='index.php?op=list&amp;subm_id=<{$album.alb_submitter}>' title='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'>
                     <span class = "wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>submitter.png' alt='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'></span><{if isset($displayButtonText)}><{$album.submitter}><{/if}></a>
             <{/if}>
-            <{if $album.download}>
+            <{if $album.download|default:false}>
                 <a class='btn btn-secondary wgg-btn' href='<{$wggallery_url}>/download.php?op=album&amp;alb_id=<{$album.id}>' title='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'>
                     <img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>download.png' alt='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}><{/if}></a>
             <{/if}>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_2.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_2.tpl
index fcd3768e3..189be7878 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_2.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_2.tpl
@@ -1,6 +1,6 @@
-<{if $album.image}>
+<{if $album.image|default:''}>
     <div class='center'>
-        <{if $album.nb_images}>
+        <{if $album.nb_images|default:0}>
             <{if isset($gallery)}>
                 <a class='' href='<{$wggallery_url}>/gallery.php?op=show&amp;alb_id=<{$album.id}><{if isset($subm_id)}>&amp;subm_id=<{$subm_id}><{/if}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_ALBUMSHOW}>' target='<{$gallery_target}>' >
                     <img class='img-fluid wgg-album-img' src='<{$album.image}>' alt='<{$album.name}>'></a>
@@ -27,7 +27,7 @@
         <a disabled class='disabled btn btn-secondary wgg-btn' title='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>'>
             <span class='wgg-btn'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGES_COUNT}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_COUNT}>'><{$smarty.const._CO_WGGALLERY_ALBUM_NO_IMAGES}></span></a>
     <{/if}>
-    <{if $album.edit}>
+    <{if $album.edit|default:false}>
         <a class='btn btn-secondary wgg-btn' href='albums.php?op=edit&amp;alb_id=<{$album.id}>' title='<{$smarty.const._EDIT}>'>
             <span class = "wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>edit.png' alt='<{$smarty.const._EDIT}>'></span><{if isset($displayButtonText)}><{$smarty.const._EDIT}><{/if}></a>
         <a class='btn btn-secondary wgg-btn' href='albums.php?op=delete&amp;alb_id=<{$album.id}>' title='<{$smarty.const._DELETE}>'>
@@ -37,7 +37,7 @@
         <a class='btn btn-secondary wgg-btn' href='index.php?op=list&amp;subm_id=<{$album.alb_submitter}>' title='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'>
             <span class = "wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>submitter.png' alt='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'></span><{if isset($displayButtonText)}><{$album.submitter}><{/if}></a>
     <{/if}>
-    <{if $album.download}>
+    <{if $album.download|default:false}>
         <a class='btn btn-secondary wgg-btn' href='<{$wggallery_url}>/download.php?op=album&amp;alb_id=<{$album.id}>' title='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'>
             <img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>download.png' alt='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}><{/if}></a>
     <{/if}>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_bcards.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_bcards.tpl
index 2c1e74e56..0fe30c7a9 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_bcards.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_bcards.tpl
@@ -34,6 +34,6 @@
         </div>
 	</div>
 
-<{if $album.linebreak}>
+<{if $album.linebreak|default:false}>
 	<div class='clear'>&nbsp;</div>
 <{/if}>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_albums_default.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_albums_default.tpl
index 5ae391ea9..d0f48e8e2 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_albums_default.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_albums_default.tpl
@@ -1,7 +1,7 @@
 <{include file='db:wggallery_header.tpl'}>
 <{if isset($albums_list)}>
 	<div class='col-sm-12 col-sm-8'>
-	<div class='panel panel-<{$panel_type}>'>
+	<div class='panel panel-<{$panel_type|default:'none'}>'>
 		<div class='panel-heading'><{$smarty.const._CO_WGGALLERY_ALBUMS_TITLE}></div>
 		<div class='panel-body'>
 			<{foreach item=album from=$albums_list|default:null}>
@@ -41,7 +41,7 @@
 						<{else}>
 							<a class='disabled btn btn-secondary wgg-btn'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>'><{$smarty.const._CO_WGGALLERY_ALBUM_NO_IMAGES}></a>
 						<{/if}>
-						<{if $album.edit}>
+						<{if $album.edit|default:false}>
                             <{if $album.nb_images}>
                                 <a class='btn btn-secondary wgg-btn' href='images.php?op=manage&amp;ref=albums&amp;alb_id=<{$album.id}>&amp;alb_pid=<{$album.pid}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_MANAGE}>'>
                                     <img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>images.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_MANAGE}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_IMAGE_MANAGE}><{/if}></a>
@@ -81,7 +81,7 @@
 
 
 	<div class='col-sm-12 col-sm-4'>
-		<div class='panel panel-<{$panel_type}>'>
+		<div class='panel panel-<{$panel_type|default:'none'}>'>
 			<div class='panel-heading'><{$smarty.const._CO_WGGALLERY_ALBUMS_SORT}></div>
 			<div class='panel-body'>
 				<ol class="sortable ui-sortable mjs-nestedSortable-branch mjs-nestedSortable-expanded">
@@ -91,7 +91,7 @@
 					<a class='btn btn-secondary wgg-btn' href='albums.php' title='<{$smarty.const._CO_WGGALLERY_UPDATE}>'>
 						<img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>reset.png' alt='<{$smarty.const._CO_WGGALLERY_UPDATE}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_UPDATE}><{/if}></a>
 					<{if isset($global_submit)}>
-						<a class='btn btn-secondary wgg-btn' href='albums.php?op=new&alb_pid=<{$albpid}>' title='<{$smarty.const._CO_WGGALLERY_ALBUM_ADD}>'>
+						<a class='btn btn-secondary wgg-btn' href='albums.php?op=new&alb_pid=<{$albPid|default:0}>' title='<{$smarty.const._CO_WGGALLERY_ALBUM_ADD}>'>
 							<img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>add.png' alt='<{$smarty.const._CO_WGGALLERY_ALBUM_ADD}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_ALBUM_ADD}><{/if}></a>
 					<{/if}>
 				</p>
@@ -117,8 +117,8 @@
                 </div>
                 <div class="modal-body">
                     <{foreach item=image from=$images|default:null}>
-                        <{if $image.alb_name}><h4 class="modal-title"><{$image.alb_name}></h4><{/if}>
-                        <input class="img <{if $image.selected}>wgg-modal-selected<{/if}>" type="image" src="<{$image.medium}>" alt="<{$image.title}>"
+                        <{if $image.alb_name|default:''}><h4 class="modal-title"><{$image.alb_name|default:''}></h4><{/if}>
+                        <input class="img <{if $image.selected|default:false}>wgg-modal-selected<{/if}>" type="image" src="<{$image.medium}>" alt="<{$image.title}>"
                                style="padding:3px;max-height:150px;max-width:200px" value="<{$image.name}>">
                     <{/foreach}>
                 </div>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_images_default.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_images_default.tpl
index 342f939b5..e00c31f4e 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_images_default.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_images_default.tpl
@@ -1,6 +1,6 @@
 <{include file='db:wggallery_header.tpl'}>
 
-<div class='card panel-<{$panel_type}> mb-3'>
+<div class='card panel-<{$panel_type|default:'none'}> mb-3'>
 	<{if isset($showlist)}>
         <div class='card-header wgg-imgindex-header'><{$smarty.const._CO_WGGALLERY_IMAGES_TITLE}> <{$alb_name}></div>
         <div class='card-body'>
@@ -8,13 +8,13 @@
                 <{foreach item=image from=$images|default:null}>
                     <div id='imglist_<{$image.id}>' class='row wgg-img-panel wgg-image-list'>
                         <div class='wgg-img-panel-row col-sm-8'>
-                            <{if $image.medium}>
+                            <{if $image.medium|default:''}>
                                 <div class='center'><img id='image_<{$image.id}>' class='img-fluid wgg-img' src='<{$image.medium}>#<{$random}>' alt='<{$image.title}>'></div>
                             <{/if}>
                         </div>
                         <div class='wgg-img-panel-row col-sm-4'>
                             <p><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_TITLE}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_TITLE}>'><{$image.title}>
-                            <{if $image.desc}><{$image.desc}><{/if}>
+                            <{if $image.desc|default:''}><{$image.desc}><{/if}>
                             </p>
                             <p><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>size.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_SIZE}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_SIZE}>'><{$image.size}> kb</p>
                             <p><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>dimension.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_SIZE}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_SIZE}>'><{$image.resx}>px / <{$image.resy}>px</p>
@@ -33,10 +33,10 @@
                             <{if $use_categories && $image.cats_list}>
 								<p class='wgg-cats'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>categories.png' alt='<{$smarty.const._CO_WGGALLERY_CATS}>' title='<{$smarty.const._CO_WGGALLERY_CATS}>'><{$image.cats_list}></p>
                             <{/if}>
-                            <{if $use_tags && $image.tags}>
+                            <{if $use_tags|default:false && $image.tags|default:false}>
 								<p class='wgg-tags'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>tags.png' alt='<{$smarty.const._CO_WGGALLERY_TAGS}>' title='<{$smarty.const._CO_WGGALLERY_TAGS}>'><{$image.tags}></p>
                             <{/if}>
-                            <{if $image.com_show}>
+                            <{if $image.com_show|default:false}>
 								<p class='wgg-comcount'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>comments.png' alt='<{$smarty.const._CO_WGGALLERY_COMMENTS}>' title='<{$smarty.const._CO_WGGALLERY_COMMENTS}>'><{$image.com_count_text}></p>
                             <{/if}>
                             <{if isset($rating) && $rating > 0}>
@@ -113,7 +113,7 @@
         <div class='wgg-img-panel-row col-12 col-sm-12 col-md-12 col-lg-12 center'><img class='img-fluid wgg-img' src='<{$file}>' alt='<{$image.title}>'></div>
         <div class='wgg-img-panel-row col-12 col-sm-6 col-md-6 col-lg6'>
             <p><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_TITLE}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_TITLE}>'><{$image.title}></p>
-            <{if $image.desc}>
+            <{if $image.desc|default:''}>
                 <p class='justify'><{$image.desc}></p>
             <{/if}>
         </div>
@@ -191,8 +191,8 @@
                             <{else}>
                             <div class="col-12 col-md-12 col-lg-12">
                             <{/if}>
-                            <{if $image.alb_name}><h4 class='modal-title'><{$image.alb_name}></h4><{/if}>
-                            <img class='img-fluid wgg-img' src='<{$image.img_modal}>' alt='<{$image.title}>'>
+                            <{if $image.alb_name|default:''}><h4 class='modal-title'><{$image.alb_name}></h4><{/if}>
+                            <img class='img-fluid wgg-img' src='<{$image.img_modal|default:''}>' alt='<{$image.title}>'>
                             <{if isset($showModalInfo)}>
                              </div>
                              <div class="col-12 col-md-6 col-lg-6">
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_images_manage.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_images_manage.tpl
index a74b73a20..573607fa6 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_images_manage.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_images_manage.tpl
@@ -3,7 +3,7 @@
 <{if isset($form)}>
 	<{$form}>
 <{else}>
-    <div class='card panel-<{$panel_type}>'>
+    <div class='card panel-<{$panel_type|default:'none'}>'>
             <div class='card-header wgg-imgindex-header'>
                 <h3><{$smarty.const._CO_WGGALLERY_IMAGE_MANAGE}> <{$alb_name}></h3>
                 <p><{$smarty.const._CO_WGGALLERY_IMAGE_MANAGE_DESC}></p>
@@ -37,7 +37,7 @@
                             </li>
                         <{/foreach}>
                     </ol>
-                <{else if $showlist}>
+                <{elseif $showlist}>
                     <div class=''>
                         <div class='errorMsg'><strong><{$smarty.const._CO_WGGALLERY_THEREARENT_IMAGES}></strong></div>
                     </div>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_default.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_default.tpl
index 99160aca7..370420ac5 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_default.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_default.tpl
@@ -1,7 +1,7 @@
 <{include file='db:wggallery_header.tpl'}>
 
 <{if isset($albums)}>
-	<div class='card panel-<{$panel_type}>'>
+	<div class='card panel-<{$panel_type|default:'none'}>'>
 		<div class='card-header wgg-cats-header'><{$index_alb_title}></div>
 		<div class='row card-body'>
 			<{foreach item=album from=$albums|default:null}>
@@ -9,21 +9,21 @@
                     <div class='col-12 col-md-3 wgg-album-panel'>
                         <{include file='db:wggallery_albumitem_2.tpl' album=$album}>
                     </div>
-                    <{if $album.linebreak}>
+                    <{if $album.linebreak|default:false}>
                         <div class='clear'>&nbsp;</div>
                     <{/if}>
                 <{elseif $number_cols_album == 3}>
                     <div class='col-12 col-md-4 wgg-album-panel'>
                         <{include file='db:wggallery_albumitem_2.tpl' album=$album}>
                     </div>
-                    <{if $album.linebreak}>
+                    <{if $album.linebreak|default:false}>
                         <div class='clear'>&nbsp;</div>
                     <{/if}>
                 <{elseif $number_cols_album == 2}>
                     <div class='col-12 col-md-6 wgg-album-panel'>
                         <{include file='db:wggallery_albumitem_2.tpl' album=$album}>
                     </div>
-                    <{if $album.linebreak}>
+                    <{if $album.linebreak|default:false}>
                         <div class='clear'>&nbsp;</div>
                     <{/if}>
                 <{else}>
@@ -39,7 +39,7 @@
     <{/if}>
 <{/if}>
 <{if isset($categories)}>
-	<div class='card panel-<{$panel_type}>'>
+	<div class='card panel-<{$panel_type|default:'none'}>'>
 		<div class='card-header wgg-cats-header'><{$index_cats_title}></div>
 		<div class='row card-body'>
 			<{foreach item=category from=$categories|default:null}>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_hovereffectideas.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_hovereffectideas.tpl
index 03c42414f..92d0c8d1d 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_hovereffectideas.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_hovereffectideas.tpl
@@ -2,7 +2,7 @@
 
 <div class="container no-pad-lr">
 <{if isset($albums)}>
-	<div class='card panel-<{$panel_type}>'>
+	<div class='card panel-<{$panel_type|default:'none'}>'>
 		<div class='card-header wgg-cats-header'><{$index_alb_title}></div>
 		<div class='card-body'>
 			<{foreach item=album from=$albums|default:null name=album}>
@@ -19,7 +19,7 @@
 	<{/if}>
 <{/if}>
 <{if isset($categories)}>
-	<div class='card panel-<{$panel_type}>'>
+	<div class='card panel-<{$panel_type|default:'none'}>'>
 		<div class='card-header wgg-cats-header'><{$index_cats_title}></div>
 		<div class='card-body'>
 			<{foreach item=category from=$categories|default:null name=category}>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_simple.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_simple.tpl
index ac1b14642..36beba0a0 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_simple.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_index_simple.tpl
@@ -2,7 +2,7 @@
 
 <div class="container no-pad-lr">
 <{if isset($albums)}>
-	<div class='card panel-<{$panel_type}>'>
+	<div class='card panel-<{$panel_type|default:'none'}>'>
 		<div class='card-header wgg-cats-header'><{$index_alb_title}></div>
 		<div class='row card-body'>
 			<{foreach item=album from=$albums|default:null}>
@@ -19,7 +19,7 @@
 	<{/if}>
 <{/if}>
 <{if !empty($categories)}>
-	<div class='card panel-<{$panel_type}>'>
+	<div class='card panel-<{$panel_type|default:'none'}>'>
 		<div class='card-header wgg-cats-header'><{$index_cats_title}></div>
 		<div class='row card-body'>
 			<{foreach item=category from=$categories|default:null}>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_search.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_search.tpl
index b03daf13e..e1aae2cc1 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_search.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_search.tpl
@@ -11,7 +11,7 @@
 <{/if}>
 
 <{if isset($showlist)}>
-    <div class='panel panel-<{$panel_type}>'>
+    <div class='panel panel-<{$panel_type|default:'none'}>'>
         <div class='panel-heading wgg-imgindex-header'><h3><{$smarty.const._MA_WGGALLERY_SEARCH_RESULT}></h3></div>
         <div class=' panel-body'>
             <{if isset($pagenav)}>
@@ -26,13 +26,13 @@
                 <{foreach item=image from=$images|default:null}>
                     <div class='row wgg-img-panel wgg-image-list'>
                         <div class='wgg-img-panel-row col-sm-8'>
-                            <{if $image.medium}>
+                            <{if $image.medium|default:''}>
                                 <div class='center'><img id='image_<{$image.id}>' class='img-fluid wgg-img' src='<{$image.medium}>#<{$random}>' alt='<{$image.title}>'></div>
                             <{/if}>
                         </div>
                         <div class='wgg-img-panel-row col-sm-4'>
                             <p><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_TITLE}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_TITLE}>'><{$image.title}></p>
-                            <{if $image.desc}>
+                            <{if $image.desc|default:''}>
                                 <p class='justify'><{$image.desc}></p>
                             <{/if}>
                             <p><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>size.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_SIZE}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_SIZE}>'><{$image.size}> kb</p>
@@ -49,7 +49,7 @@
                             <{if $use_categories && $image.cats_list}>
 								<p class='wgg-cats'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>categories.png' alt='<{$smarty.const._CO_WGGALLERY_CATS}>' title='<{$smarty.const._CO_WGGALLERY_CATS}>'><{$image.cats_list}></p>
                             <{/if}>
-                            <{if $use_tags && $image.tags}>
+                            <{if $use_tags|default:false && $image.tags|default:false}>
 								<p class='wgg-tags'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>tags.png' alt='<{$smarty.const._CO_WGGALLERY_TAGS}>' title='<{$smarty.const._CO_WGGALLERY_TAGS}>'><{$image.tags}></p>
                             <{/if}>
                             <{if isset($rating) && $rating > 0}>
@@ -69,7 +69,7 @@
                                     <{if $image.exif}><img src="<{$wggallery_icon_url_16}>on.png" alt="_YES"><{else}><img src="<{$wggallery_icon_url_16}>0.png" alt="_NO"><{/if}>
                                 </p>
                             <{/if}>
-                            <{if $image.com_show}>
+                            <{if $image.com_show|default:false}>
 								<p class='wgg-comcount'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>comments.png' alt='<{$smarty.const._CO_WGGALLERY_COMMENTS}>' title='<{$smarty.const._CO_WGGALLERY_COMMENTS}>'><{$image.com_count_text}></p>
                             <{/if}>
                         </div>
diff --git a/htdocs/themes/xswatch4/modules/wggallery/wggallery_upload.tpl b/htdocs/themes/xswatch4/modules/wggallery/wggallery_upload.tpl
index ddf44f4f4..77e9a8515 100644
--- a/htdocs/themes/xswatch4/modules/wggallery/wggallery_upload.tpl
+++ b/htdocs/themes/xswatch4/modules/wggallery/wggallery_upload.tpl
@@ -102,7 +102,7 @@
 <div class='multiupload-footer'>
 	<{if isset($albId)}>
 		<div class='col-xs-12 col-sm-12 right'>
-			<a class='btn btn-secondary wgg-btn' href='images.php?op=list&amp;ref=albums&amp;alb_id=<{$albId}>&amp;alb_pid=<{$albPid}><{if isset($subm_id)}>&amp;subm_id=<{$subm_id}><{/if}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>'>
+			<a class='btn btn-secondary wgg-btn' href='images.php?op=list&amp;ref=albums&amp;alb_id=<{$albId}>&amp;alb_pid=<{$albPid|default:0}><{if isset($subm_id)}>&amp;subm_id=<{$subm_id}><{/if}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>'>
                 <img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}><{/if}></a>
             <a class='btn btn-secondary wgg-btn' href='albums.php?op=edit&amp;alb_id=<{$albId}>' title='<{$smarty.const._CO_WGGALLERY_ALBUM_EDIT}>'>
 				<span class="wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>edit.png' alt='<{$smarty.const._CO_WGGALLERY_ALBUM_EDIT}>'></span><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_ALBUM_EDIT}><{/if}></a>