diff --git a/src/common/AdaptiveStream.cpp b/src/common/AdaptiveStream.cpp
index d143936db..fda497ee3 100755
--- a/src/common/AdaptiveStream.cpp
+++ b/src/common/AdaptiveStream.cpp
@@ -21,6 +21,7 @@
 #include <iostream>
 #include <cstring>
 #include "../oscompat.h"
+#include "../log.h"
 #include <math.h>
 
 using namespace adaptive;
@@ -141,7 +142,15 @@ void AdaptiveStream::worker()
   do {
     thread_data_->signal_dl_.wait(lckdl);
 
-    bool ret  = download_segment();
+    bool ret(download_segment());
+    unsigned int retryCount(10);
+
+    while (!ret && !stopped_ && retryCount-- && tree_.has_timeshift_buffer_)
+    {
+      std::this_thread::sleep_for(std::chrono::seconds(1));
+      Log(LOGLEVEL_DEBUG, "AdaptiveStream: trying to reload segment ...");
+      ret = download_segment();
+    }
 
     //Signal finished download
     {
diff --git a/src/common/AdaptiveTree.cpp b/src/common/AdaptiveTree.cpp
index 99ca33b1b..bfb9124fb 100755
--- a/src/common/AdaptiveTree.cpp
+++ b/src/common/AdaptiveTree.cpp
@@ -138,6 +138,8 @@ namespace adaptive
     seg.range_begin_ += fragmentDuration;
     seg.range_end_ ++;
 
+    Log(LOGLEVEL_DEBUG, "AdaptiveTree: insert live segment: pts: %llu range_end: %llu", seg.startPTS_, seg.range_end_);
+
     for (std::vector<Representation*>::iterator b(adpm->repesentations_.begin()), e(adpm->repesentations_.end()); b != e; ++b)
       (*b)->segments_.insert(seg);
   }
@@ -214,7 +216,7 @@ namespace adaptive
         }
       }
     }
-    else if (manifestUpdateParam == "etag")
+    else if (manifestUpdateParam == "full")
     {
       update_parameter_ = manifestUpdateParam;
     }
diff --git a/src/main.cpp b/src/main.cpp
index 287adacb0..a93a1094e 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -263,8 +263,9 @@ bool KodiAdaptiveStream::download(const char* url, const std::map<std::string, s
   if (!file.CURLCreate(url))
     return false;
   file.CURLAddOption(ADDON_CURL_OPTION_PROTOCOL, "seekable" , "0");
-  file.CURLAddOption(ADDON_CURL_OPTION_HEADER, "Connection", "keep-alive");
   file.CURLAddOption(ADDON_CURL_OPTION_PROTOCOL, "acceptencoding", "gzip, deflate");
+  if (mediaHeaders.find("connection") == mediaHeaders.end())
+    file.CURLAddOption(ADDON_CURL_OPTION_HEADER, "connection", "keep-alive");
 
   for (const auto &entry : mediaHeaders)
   {
diff --git a/src/parser/DASHTree.cpp b/src/parser/DASHTree.cpp
index 99c4c793a..a997f6acc 100755
--- a/src/parser/DASHTree.cpp
+++ b/src/parser/DASHTree.cpp
@@ -1401,8 +1401,6 @@ void DASHTree::RefreshSegments(Representation *rep, const Segment *seg)
         sprintf(buf, "%u", nextStartNumber);
         replaced.replace(update_parameter_pos_, 14, buf);
       }
-      else if (etag_.empty())
-        return;
 
       unsigned int retryCount(5);
 
@@ -1411,7 +1409,8 @@ void DASHTree::RefreshSegments(Representation *rep, const Segment *seg)
       updateTree.manifest_headers_ = manifest_headers_;
       if (!~update_parameter_pos_)
       {
-        updateTree.manifest_headers_["If-None-Match"] = "\"" + etag_ + "\"";
+        if (!etag_.empty())
+          updateTree.manifest_headers_["If-None-Match"] = "\"" + etag_ + "\"";
         if (!last_modified_.empty())
           updateTree.manifest_headers_["If-Modified-Since"] = last_modified_;
       }