diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0c542cb5b062f967f1e1e3dc8b258863d4294e6..1f399b87f64610a0f7fa6b652ac4ece9605fd60f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - \#118 - Using shared_ptr instead of weak_ptr to avoid performance loss
 - \#122 - Add unique id for Job
 - \#130 - Set task state MOVED after resource copy it completed
+- \#149 - Improve large query optimizer pass
 
 ## Task
 
diff --git a/core/src/db/engine/ExecutionEngineImpl.cpp b/core/src/db/engine/ExecutionEngineImpl.cpp
index 66e9795ff3c5e9bbebbda9f416c590b43d84c8b5..b6db2616cb8ec8cade5dcb83d52082be1c0a520f 100644
--- a/core/src/db/engine/ExecutionEngineImpl.cpp
+++ b/core/src/db/engine/ExecutionEngineImpl.cpp
@@ -258,7 +258,7 @@ Status
 ExecutionEngineImpl::CopyToGpu(uint64_t device_id, bool hybrid) {
     if (hybrid) {
         const std::string key = location_ + ".quantizer";
-        std::vector<uint64_t> gpus = scheduler::get_gpu_pool();
+        std::vector<uint64_t> gpus{device_id};
 
         const int64_t NOT_FOUND = -1;
         int64_t device_id = NOT_FOUND;
diff --git a/core/src/scheduler/optimizer/LargeSQ8HPass.cpp b/core/src/scheduler/optimizer/LargeSQ8HPass.cpp
index ddcee414a72ed21e70cc551a2a88d1b15c13aca9..cacedd620888274bf4814339f05fb96b26b6b7a2 100644
--- a/core/src/scheduler/optimizer/LargeSQ8HPass.cpp
+++ b/core/src/scheduler/optimizer/LargeSQ8HPass.cpp
@@ -55,16 +55,18 @@ LargeSQ8HPass::Run(const TaskPtr& task) {
     }
 
     std::vector<uint64_t> gpus = scheduler::get_gpu_pool();
-    std::vector<int64_t> all_free_mem;
-    for (auto& gpu : gpus) {
-        auto cache = cache::GpuCacheMgr::GetInstance(gpu);
-        auto free_mem = cache->CacheCapacity() - cache->CacheUsage();
-        all_free_mem.push_back(free_mem);
-    }
-
-    auto max_e = std::max_element(all_free_mem.begin(), all_free_mem.end());
-    auto best_index = std::distance(all_free_mem.begin(), max_e);
-    auto best_device_id = gpus[best_index];
+    //    std::vector<int64_t> all_free_mem;
+    //    for (auto& gpu : gpus) {
+    //        auto cache = cache::GpuCacheMgr::GetInstance(gpu);
+    //        auto free_mem = cache->CacheCapacity() - cache->CacheUsage();
+    //        all_free_mem.push_back(free_mem);
+    //    }
+    //
+    //    auto max_e = std::max_element(all_free_mem.begin(), all_free_mem.end());
+    //    auto best_index = std::distance(all_free_mem.begin(), max_e);
+    //    auto best_device_id = gpus[best_index];
+    auto best_device_id = count_ % gpus.size();
+    count_++;
 
     ResourcePtr res_ptr = ResMgrInst::GetInstance()->GetResource(ResourceType::GPU, best_device_id);
     if (not res_ptr) {
diff --git a/core/src/scheduler/optimizer/LargeSQ8HPass.h b/core/src/scheduler/optimizer/LargeSQ8HPass.h
index 1e00aa4a1bbe4539cf8082447c86fe512c4cd0de..9d135d413ae3038ca38596d6d90a0e68839335aa 100644
--- a/core/src/scheduler/optimizer/LargeSQ8HPass.h
+++ b/core/src/scheduler/optimizer/LargeSQ8HPass.h
@@ -43,6 +43,7 @@ class LargeSQ8HPass : public Pass {
 
  private:
     int32_t threshold_ = std::numeric_limits<int32_t>::max();
+    int64_t count_ = 0;
 };
 
 using LargeSQ8HPassPtr = std::shared_ptr<LargeSQ8HPass>;