diff --git a/build/plugins/videobox/propset.xml b/build/plugins/videobox/propset.xml
index 4b0d003..fd956e4 100644
--- a/build/plugins/videobox/propset.xml
+++ b/build/plugins/videobox/propset.xml
@@ -47,10 +47,10 @@
         default="<ul class="vb_gallery [[+class]]" style="[[+style]]">[[+content]]</ul>
[[+pagination]]" />
 
         <field name="linkTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_LINK_TPL" description="PLG_SYSTEM_VIDEOBOX_LINK_TPL_DESC" 
-        default="&lt;a href=&quot;[[+link]]&quot; class=&quot;vb_link&quot; rel=&quot;[[+rel]]&quot; title=&quot;[[+title]]&quot; data-videowidth=&quot;[[+pWidth]]&quot; data-videoheight=&quot;[[+pHeight]]&quot;&gt;[[+linkText]]&lt;/a&gt;" />
+        default="&lt;a href=&quot;[[+link]]&quot; class=&quot;vb_link [[+class]]&quot; style=&quot;[[+style]]&quot; rel=&quot;[[+rel]]&quot; title=&quot;[[+title]]&quot; data-videowidth=&quot;[[+pWidth]]&quot; data-videoheight=&quot;[[+pHeight]]&quot;&gt;[[+linkText]]&lt;/a&gt;" />
 
         <field name="playerTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_PLAYER_TPL" description="PLG_SYSTEM_VIDEOBOX_PLAYER_TPL_DESC" 
-        default="&lt;div class=&quot;vb_video_frame&quot; style=&quot;max-width: [[+pWidth]]px;&quot;&gt;&lt;div class=&quot;vb_video_sizer&quot; style=&quot;padding-bottom: [[+ratio]]%;&quot;&gt;&lt;iframe src=&quot;[[+link]]&quot; frameborder=&quot;0&quot; allowfullscreen oallowfullscreen msallowfullscreen webkitallowfullscreen mozallowfullscreen &gt;&lt;/iframe&gt;&lt;/div&gt;&lt;span class=&quot;vb_video_title&quot; &gt;[[+title]]&lt;/span&gt;&lt;/div&gt;" />
+        default="&lt;div class=&quot;vb_video_frame [[+class]]&quot; style=&quot;max-width: [[+pWidth]]px; [[+style]]&quot;&gt;&lt;div class=&quot;vb_video_sizer&quot; style=&quot;padding-bottom: [[+ratio]]%;&quot;&gt;&lt;iframe src=&quot;[[+link]]&quot; frameborder=&quot;0&quot; allowfullscreen oallowfullscreen msallowfullscreen webkitallowfullscreen mozallowfullscreen &gt;&lt;/iframe&gt;&lt;/div&gt;&lt;span class=&quot;vb_video_title&quot; &gt;[[+title]]&lt;/span&gt;&lt;/div&gt;" />
 
         <field name="sliderItemTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_SLIDER_ITEM_TPL" description="PLG_SYSTEM_VIDEOBOX_SLIDER_ITEM_TPL_DESC" 
         default="&lt;li class=&quot;vb_video_cont vb_gal&quot; style=&quot;flex: [[+ratio]] [[+ratio]] [[+basis]]px&quot;&gt;[[+content]]&lt;/li&gt;" />
diff --git a/build/plugins/videobox/videobox.php b/build/plugins/videobox/videobox.php
index a59415b..79f037b 100644
--- a/build/plugins/videobox/videobox.php
+++ b/build/plugins/videobox/videobox.php
@@ -286,7 +286,7 @@ private function generateOutput($videobox, $scriptProperties){
                     return $videobox->parseTemplate($scriptProperties['galleryTpl'], array('content' => $content, 'pagination' => $pagination));
             }
         } else {
-            $autoPlay = isset($autoPlay) && $autoPlay && $scriptProperties['display'] == 'player' && (!isset($videobox->autoPlay) || !$videobox->autoPlay);
+            $autoPlay = isset($scriptProperties['autoPlay']) && $scriptProperties['autoPlay'] && $scriptProperties['display'] == 'player' && (!isset($videobox->autoPlay) || !$videobox->autoPlay);
             $scriptProperties['autoPlay'] = $autoPlay;
             if($autoPlay) $videobox->autoPlay = true;
             ksort($scriptProperties);
@@ -294,7 +294,7 @@ private function generateOutput($videobox, $scriptProperties){
             $data = $videobox->getCache($propHash);
             if($data) return $data;
             $video = $videos[0];
-            $props = array_merge(array('vbOptions' => htmlspecialchars(json_encode($vbOptions)), 'rel' => $scriptProperties['player'], 'pWidth' => $scriptProperties['pWidth'], 'pHeight' => $scriptProperties['pHeight'], 'tWidth' => $scriptProperties['tWidth'], 'tHeight' => $scriptProperties['tHeight']), array('title' => $video->getTitle(), 'link' => $video->getPlayerLink($scriptProperties['display'] != 'player' || $autoPlay), 'ratio' => (100*$scriptProperties['pHeight']/$scriptProperties['pWidth'])));
+            $props = array_merge(array('vbOptions' => htmlspecialchars(json_encode($vbOptions)), 'rel' => $scriptProperties['player'], 'pWidth' => $scriptProperties['pWidth'], 'pHeight' => $scriptProperties['pHeight'], 'tWidth' => $scriptProperties['tWidth'], 'tHeight' => $scriptProperties['tHeight']), array('title' => $video->getTitle(), 'link' => $video->getPlayerLink(in_array($scriptProperties['display'], array('box', 'link', 'links')) || $autoPlay), 'ratio' => (100*$scriptProperties['pHeight']/$scriptProperties['pWidth'])));
             switch($scriptProperties['display']){
                 case 'links':
                     $props['linkText'] = isset($linkText) ? trim($linkText) : $video->getTitle(true);
diff --git a/package.json b/package.json
index 17c781b..da018ad 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "license": "GPL-3.0",
   "readme": "README.md",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "name": "Videobox-Joomla",
   "copyright": "Hitko",
   "homepage": "https://hitko.eu/videobox/",
diff --git a/src/plugins/videobox/propset.xml b/src/plugins/videobox/propset.xml
index 4b0d003..fd956e4 100644
--- a/src/plugins/videobox/propset.xml
+++ b/src/plugins/videobox/propset.xml
@@ -47,10 +47,10 @@
         default="&lt;ul class=&quot;vb_gallery [[+class]]&quot; style=&quot;[[+style]]&quot;&gt;[[+content]]&lt;/ul&gt;&#10;[[+pagination]]" />
 
         <field name="linkTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_LINK_TPL" description="PLG_SYSTEM_VIDEOBOX_LINK_TPL_DESC" 
-        default="&lt;a href=&quot;[[+link]]&quot; class=&quot;vb_link&quot; rel=&quot;[[+rel]]&quot; title=&quot;[[+title]]&quot; data-videowidth=&quot;[[+pWidth]]&quot; data-videoheight=&quot;[[+pHeight]]&quot;&gt;[[+linkText]]&lt;/a&gt;" />
+        default="&lt;a href=&quot;[[+link]]&quot; class=&quot;vb_link [[+class]]&quot; style=&quot;[[+style]]&quot; rel=&quot;[[+rel]]&quot; title=&quot;[[+title]]&quot; data-videowidth=&quot;[[+pWidth]]&quot; data-videoheight=&quot;[[+pHeight]]&quot;&gt;[[+linkText]]&lt;/a&gt;" />
 
         <field name="playerTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_PLAYER_TPL" description="PLG_SYSTEM_VIDEOBOX_PLAYER_TPL_DESC" 
-        default="&lt;div class=&quot;vb_video_frame&quot; style=&quot;max-width: [[+pWidth]]px;&quot;&gt;&lt;div class=&quot;vb_video_sizer&quot; style=&quot;padding-bottom: [[+ratio]]%;&quot;&gt;&lt;iframe src=&quot;[[+link]]&quot; frameborder=&quot;0&quot; allowfullscreen oallowfullscreen msallowfullscreen webkitallowfullscreen mozallowfullscreen &gt;&lt;/iframe&gt;&lt;/div&gt;&lt;span class=&quot;vb_video_title&quot; &gt;[[+title]]&lt;/span&gt;&lt;/div&gt;" />
+        default="&lt;div class=&quot;vb_video_frame [[+class]]&quot; style=&quot;max-width: [[+pWidth]]px; [[+style]]&quot;&gt;&lt;div class=&quot;vb_video_sizer&quot; style=&quot;padding-bottom: [[+ratio]]%;&quot;&gt;&lt;iframe src=&quot;[[+link]]&quot; frameborder=&quot;0&quot; allowfullscreen oallowfullscreen msallowfullscreen webkitallowfullscreen mozallowfullscreen &gt;&lt;/iframe&gt;&lt;/div&gt;&lt;span class=&quot;vb_video_title&quot; &gt;[[+title]]&lt;/span&gt;&lt;/div&gt;" />
 
         <field name="sliderItemTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_SLIDER_ITEM_TPL" description="PLG_SYSTEM_VIDEOBOX_SLIDER_ITEM_TPL_DESC" 
         default="&lt;li class=&quot;vb_video_cont vb_gal&quot; style=&quot;flex: [[+ratio]] [[+ratio]] [[+basis]]px&quot;&gt;[[+content]]&lt;/li&gt;" />
diff --git a/src/plugins/videobox/videobox.php b/src/plugins/videobox/videobox.php
index a59415b..79f037b 100644
--- a/src/plugins/videobox/videobox.php
+++ b/src/plugins/videobox/videobox.php
@@ -286,7 +286,7 @@ private function generateOutput($videobox, $scriptProperties){
                     return $videobox->parseTemplate($scriptProperties['galleryTpl'], array('content' => $content, 'pagination' => $pagination));
             }
         } else {
-            $autoPlay = isset($autoPlay) && $autoPlay && $scriptProperties['display'] == 'player' && (!isset($videobox->autoPlay) || !$videobox->autoPlay);
+            $autoPlay = isset($scriptProperties['autoPlay']) && $scriptProperties['autoPlay'] && $scriptProperties['display'] == 'player' && (!isset($videobox->autoPlay) || !$videobox->autoPlay);
             $scriptProperties['autoPlay'] = $autoPlay;
             if($autoPlay) $videobox->autoPlay = true;
             ksort($scriptProperties);
@@ -294,7 +294,7 @@ private function generateOutput($videobox, $scriptProperties){
             $data = $videobox->getCache($propHash);
             if($data) return $data;
             $video = $videos[0];
-            $props = array_merge(array('vbOptions' => htmlspecialchars(json_encode($vbOptions)), 'rel' => $scriptProperties['player'], 'pWidth' => $scriptProperties['pWidth'], 'pHeight' => $scriptProperties['pHeight'], 'tWidth' => $scriptProperties['tWidth'], 'tHeight' => $scriptProperties['tHeight']), array('title' => $video->getTitle(), 'link' => $video->getPlayerLink($scriptProperties['display'] != 'player' || $autoPlay), 'ratio' => (100*$scriptProperties['pHeight']/$scriptProperties['pWidth'])));
+            $props = array_merge(array('vbOptions' => htmlspecialchars(json_encode($vbOptions)), 'rel' => $scriptProperties['player'], 'pWidth' => $scriptProperties['pWidth'], 'pHeight' => $scriptProperties['pHeight'], 'tWidth' => $scriptProperties['tWidth'], 'tHeight' => $scriptProperties['tHeight']), array('title' => $video->getTitle(), 'link' => $video->getPlayerLink(in_array($scriptProperties['display'], array('box', 'link', 'links')) || $autoPlay), 'ratio' => (100*$scriptProperties['pHeight']/$scriptProperties['pWidth'])));
             switch($scriptProperties['display']){
                 case 'links':
                     $props['linkText'] = isset($linkText) ? trim($linkText) : $video->getTitle(true);