diff --git a/default.py b/default.py
index 92bf4c6d..9485afe1 100644
--- a/default.py
+++ b/default.py
@@ -28,11 +28,17 @@ except:
 
 ##### Play items via plugin://plugin.video.emby/ #####
 if  mode == "play":
+    addonSettings = xbmcaddon.Addon(id='plugin.video.emby')
+    selectAction = addonSettings.getSetting('selectAction')
+    ##### info only working from widgets currently #####
+    if selectAction == "1" and xbmc.getCondVisibility("Window.IsActive(home)"):
+        entrypoint.showInfo(id)
+    else:
+        entrypoint.doPlayback(id)
+   
+elif mode == "playnow":   
     entrypoint.doPlayback(id)
-    
-elif mode == "info":
-    entrypoint.showInfo(id)
-    
+     
 elif mode == "person":
     entrypoint.showPersonInfo(id,name)
 
diff --git a/resources/lib/ItemInfo.py b/resources/lib/ItemInfo.py
index cb890c88..d3a292e7 100644
--- a/resources/lib/ItemInfo.py
+++ b/resources/lib/ItemInfo.py
@@ -124,7 +124,7 @@ class ItemInfo(xbmcgui.WindowXMLDialog):
                     self.isTrailer = True
                 
             
-        self.playUrl = "plugin://plugin.video.emby/?id=%s&mode=play" % id
+        self.playUrl = "plugin://plugin.video.emby/?id=%s&mode=playnow" % id
             
         try:
             trailerButton = self.getControl(3102)
@@ -134,7 +134,7 @@ class ItemInfo(xbmcgui.WindowXMLDialog):
                     jsonData = self.downloadUtils.downloadUrl(itemTrailerUrl)
                     if(jsonData != ""): 
                         trailerItem = jsonData
-                        self.trailerUrl = "plugin://plugin.video.emby/trailer/?id=%s&mode=play" % trailerItem[0][u'Id'] 
+                        self.trailerUrl = "plugin://plugin.video.emby/trailer/?id=%s&mode=playnow" % trailerItem[0][u'Id'] 
                 else:
                     trailerButton.setEnabled(False)
         except:
@@ -406,10 +406,11 @@ class ItemInfo(xbmcgui.WindowXMLDialog):
             seriesimage = API().getArtwork(item, "SeriesPrimary")
             try:
                 self.getControl(3099).setImage(seriesimage)
+                self.getControl(3009).setImage(image)
+            
             except:
                 pass
             
-            self.getControl(3009).setImage(image)
             if(cappedPercentage != None):
                 self.getControl(3010).setImage("Progress\progress_" + str(cappedPercentage) + ".png")
         else:
diff --git a/resources/lib/PersonInfo.py b/resources/lib/PersonInfo.py
index 56af1813..be833226 100644
--- a/resources/lib/PersonInfo.py
+++ b/resources/lib/PersonInfo.py
@@ -114,7 +114,7 @@ class PersonInfo(xbmcgui.WindowXMLDialog):
                 listItem = xbmcgui.ListItem(label=item_name, label2=type_info, iconImage=thumbPath, thumbnailImage=thumbPath)
                 listItem.setArt({"fanart":fanArt})
                 
-                actionUrl = "plugin://plugin.video.emby?id=" + item_id + "&mode=info"
+                actionUrl = "plugin://plugin.video.emby?id=" + item_id + "&mode=play"
                 listItem.setProperty("ActionUrl", actionUrl)
                 
                 otherItemsList.addItem(listItem)
diff --git a/resources/lib/WriteKodiVideoDB.py b/resources/lib/WriteKodiVideoDB.py
index 4f522489..4e34d2d5 100644
--- a/resources/lib/WriteKodiVideoDB.py
+++ b/resources/lib/WriteKodiVideoDB.py
@@ -106,7 +106,7 @@ class WriteKodiVideoDB():
             jsonData = downloadUtils.downloadUrl(itemTrailerUrl)
             if(jsonData != ""):
                 trailerItem = jsonData
-                trailerUrl = "plugin://plugin.video.emby/trailer/?id=%s&mode=play" % trailerItem[0][u'Id']
+                trailerUrl = "plugin://plugin.video.emby/trailer/?id=%s&mode=playnow" % trailerItem[0][u'Id']
         
         if MBitem.get("DateCreated") != None:
             dateadded = MBitem["DateCreated"].split('.')[0].replace('T', " ")
@@ -122,12 +122,7 @@ class WriteKodiVideoDB():
         #### ADD OR UPDATE THE FILE AND PATH ###########
         #### NOTE THAT LASTPLAYED AND PLAYCOUNT ARE STORED AT THE FILE ENTRY
         path = "plugin://plugin.video.emby/movies/%s/" % MBitem["Id"]
-        addonSettings = xbmcaddon.Addon(id='plugin.video.emby')
-        selectAction = addonSettings.getSetting('selectAction')
-        if(selectAction == "1"):
-            filename = "plugin://plugin.video.emby/movies/%s/?id=%s&mode=info" % (MBitem["Id"],MBitem["Id"])
-        else:
-            filename = "plugin://plugin.video.emby/movies/%s/?id=%s&mode=play" % (MBitem["Id"],MBitem["Id"])
+        filename = "plugin://plugin.video.emby/movies/%s/?id=%s&mode=play" % (MBitem["Id"],MBitem["Id"])
                   
         #create the path
         cursor.execute("SELECT idPath as pathid FROM path WHERE strPath = ?",(path,))
@@ -548,13 +543,7 @@ class WriteKodiVideoDB():
         #### ADD OR UPDATE THE FILE AND PATH ###########
         #### NOTE THAT LASTPLAYED AND PLAYCOUNT ARE STORED AT THE FILE ENTRY        
         path = "plugin://plugin.video.emby/tvshows/" + MBitem["SeriesId"] + "/"
-        addonSettings = xbmcaddon.Addon(id='plugin.video.emby')
-        selectAction = addonSettings.getSetting('selectAction')
-        if(selectAction == "1"):
-            filename = "plugin://plugin.video.emby/tvshows/" + MBitem["SeriesId"] + "/?id=" + MBitem["Id"] + "&mode=info"
-        else:
-            filename = "plugin://plugin.video.emby/tvshows/" + MBitem["SeriesId"] + "/?id=" + MBitem["Id"] + "&mode=play"
-        
+        filename = "plugin://plugin.video.emby/tvshows/" + MBitem["SeriesId"] + "/?id=" + MBitem["Id"] + "&mode=play"
             
         #create the new path - return id if already exists  
         cursor.execute("SELECT idPath as pathid FROM path WHERE strPath = ?",(path,))