diff --git a/engine/database/models.cc b/engine/database/models.cc
index 6bf891040..fa4144b24 100644
--- a/engine/database/models.cc
+++ b/engine/database/models.cc
@@ -310,7 +310,8 @@ cpp::result<std::vector<ModelEntry>, std::string> Models::GetModelSources()
         "SELECT model_id, author_repo_id, branch_name, "
         "path_to_model_yaml, model_alias, model_format, "
         "model_source, status, engine, metadata FROM models "
-        "WHERE model_source != \"\" AND (status = \"downloaded\" OR status = "
+        "WHERE model_source != \"\" AND model_source != \"imported\" AND "
+        "(status = \"downloaded\" OR status = "
         "\"downloadable\")");
     while (query.executeStep()) {
       ModelEntry entry;
diff --git a/engine/extensions/remote-engine/remote_engine.cc b/engine/extensions/remote-engine/remote_engine.cc
index 7bd938b69..e962eafad 100644
--- a/engine/extensions/remote-engine/remote_engine.cc
+++ b/engine/extensions/remote-engine/remote_engine.cc
@@ -30,11 +30,16 @@ size_t StreamWriteCallback(char* ptr, size_t size, size_t nmemb,
   Json::Value check_error;
   Json::Reader reader;
   context->chunks += chunk;
-  if (reader.parse(context->chunks, check_error) ||
-      (reader.parse(chunk, check_error) &&
-       chunk.find("error") != std::string::npos)) {
+
+  long http_code = k200OK;
+  if (context->curl) {
+    curl_easy_getinfo(context->curl, CURLINFO_RESPONSE_CODE, &http_code);
+  }
+  if (http_code != k200OK && (reader.parse(context->chunks, check_error) ||
+                              (chunk.find("error") != std::string::npos &&
+                               reader.parse(chunk, check_error)))) {
     CTL_WRN(context->chunks);
-    CTL_WRN(chunk);
+    CTL_WRN("http code: " << http_code << " - " << chunk);
     CTL_INF("Request: " << context->last_request);
     Json::Value status;
     status["is_done"] = true;
@@ -139,7 +144,9 @@ CurlResponse RemoteEngine::MakeStreamingChatCompletionRequest(
       renderer_,
       stream_template,
       true,
-      body};
+      body,
+      "",
+      curl};
 
   curl_easy_setopt(curl, CURLOPT_URL, full_url.c_str());
   curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
diff --git a/engine/extensions/remote-engine/remote_engine.h b/engine/extensions/remote-engine/remote_engine.h
index 90ca1397f..27d23e3aa 100644
--- a/engine/extensions/remote-engine/remote_engine.h
+++ b/engine/extensions/remote-engine/remote_engine.h
@@ -27,6 +27,7 @@ struct StreamContext {
   bool need_stop = true;
   std::string last_request;
   std::string chunks;
+  CURL* curl;
 };
 struct CurlResponse {
   std::string body;
diff --git a/engine/services/model_service.cc b/engine/services/model_service.cc
index c796bf4ed..32f92beee 100644
--- a/engine/services/model_service.cc
+++ b/engine/services/model_service.cc
@@ -155,7 +155,7 @@ ModelService::ModelService(std::shared_ptr<DatabaseService> db_service,
       inference_svc_(inference_service),
       engine_svc_(engine_svc),
       task_queue_(task_queue) {
-  ProcessBgrTasks();
+  // ProcessBgrTasks();
 };
 
 void ModelService::ForceIndexingModelList() {