diff --git a/src/shared_gui_components/BuildingComponentDialogCentralWidget.cpp b/src/shared_gui_components/BuildingComponentDialogCentralWidget.cpp
index 364c3cede..ade6236e9 100644
--- a/src/shared_gui_components/BuildingComponentDialogCentralWidget.cpp
+++ b/src/shared_gui_components/BuildingComponentDialogCentralWidget.cpp
@@ -15,6 +15,7 @@
 
 #include <cstddef>
 #include <openstudio/measure/OSArgument.hpp>
+
 #include <openstudio/utilities/bcl/BCL.hpp>
 #include <openstudio/utilities/bcl/LocalBCL.hpp>
 #include <openstudio/utilities/bcl/RemoteBCL.hpp>
@@ -168,89 +169,53 @@ void BuildingComponentDialogCentralWidget::setTid() {
   requestComponents(m_filterType, m_tid, m_pageIdx, m_searchString);
 }
 
-std::vector<openstudio::BCLSearchResult> BuildingComponentDialogCentralWidget::fetchAndSortResponses(const std::string& filterType, int tid,
-                                                                                                     const QString& searchString) {
-  m_allResponses.clear();
-
-  RemoteBCL remoteBCL;
-  remoteBCL.setTimeOutSeconds(m_timeoutSeconds);
-
-  std::vector<BCLSearchResult> responses;
-  int totalPages = 1;
-  int currentPage = 0;
-
-  // Collect all responses from all pages
-  do {
-    std::vector<BCLSearchResult> pageResponses;
-    if (filterType == "components") {
-      pageResponses = remoteBCL.searchComponentLibrary(searchString.toStdString(), tid, currentPage);
-    } else if (filterType == "measures") {
-      pageResponses = remoteBCL.searchMeasureLibrary(searchString.toStdString(), tid, currentPage);
-    }
-    responses.insert(responses.end(), pageResponses.begin(), pageResponses.end());
-    totalPages = remoteBCL.numResultPages();
-  } while (++currentPage < totalPages);
-
-  if (!responses.empty()) {
-    std::sort(responses.begin(), responses.end(), [](const BCLSearchResult& a, const BCLSearchResult& b) { return a.name() < b.name(); });
-  }
-
-  return responses;
-}
-
 // Note: don't call this directly if the "wait" screen is desired
 void BuildingComponentDialogCentralWidget::setTid(const std::string& filterType, int tid, int pageIdx, const QString& title,
                                                   const QString& searchString) {
 
-  std::string newKey = std::to_string(tid) + filterType + searchString.toStdString();
-  std::string currentKey = std::to_string(m_tid) + m_filterType + m_searchString.toStdString();
+  if (m_tid != tid || m_searchString != searchString) {
+    m_collapsibleComponentList->firstPage();
+  }
 
-  m_searchString = searchString;
   m_filterType = filterType;
+
   m_tid = tid;
 
-  if (newKey != currentKey) {
-    m_allResponses = fetchAndSortResponses(filterType, tid, searchString);
-    m_collapsibleComponentList->firstPage();
-    pageIdx = 0;
-  }
+  m_searchString = searchString;
 
-  // Clear existing components
+  //std::vector<Component *> components = m_collapsibleComponentList->components();
   std::vector<Component*> components = m_componentList->components();  // TODO replace with code above
+
   for (auto& comp : components) {
     delete comp;
   }
 
-  // Paginate responses
-  int itemsPerPage = 10;  // Assuming 10 items per page
-
-  if (!m_allResponses.empty()) {
-    size_t startIdx = pageIdx * itemsPerPage;
-    size_t endIdx = std::min(startIdx + itemsPerPage, m_allResponses.size());
-    std::vector<BCLSearchResult> paginatedResponses(m_allResponses.begin() + startIdx, m_allResponses.begin() + endIdx);
+  RemoteBCL remoteBCL;
+  remoteBCL.setTimeOutSeconds(m_timeoutSeconds);
+  std::vector<BCLSearchResult> responses;
+  if (filterType == "components") {
+    responses = remoteBCL.searchComponentLibrary(searchString.toStdString(), tid, pageIdx);
+  } else if (filterType == "measures") {
+    responses = remoteBCL.searchMeasureLibrary(searchString.toStdString(), tid, pageIdx);
+  }
 
-    for (const auto& response : paginatedResponses) {
-      auto* component = new Component(response);
+  for (const auto& response : responses) {
+    auto* component = new Component(response);
 
-      // TODO replace with a componentList owned by m_collapsibleComponentList
-      m_componentList->addComponent(component);
-    }
+    // TODO replace with a componentList owned by m_collapsibleComponentList
+    m_componentList->addComponent(component);
   }
 
   // the parent taxonomy
   m_collapsibleComponentList->setText(title);
 
   // the total number of results
-  int lastTotalResults = m_allResponses.size();
+  int lastTotalResults = remoteBCL.lastTotalResults();
   m_collapsibleComponentList->setNumResults(lastTotalResults);
 
   // the number of pages of results
-  if (lastTotalResults == 0) {
-    m_collapsibleComponentList->setNumPages(0);
-  } else {
-    int numResultPages = (lastTotalResults % itemsPerPage == 0) ? (lastTotalResults / itemsPerPage) : (lastTotalResults / itemsPerPage) + 1;
-    m_collapsibleComponentList->setNumPages(numResultPages);
-  }
+  int numResultPages = remoteBCL.numResultPages();
+  m_collapsibleComponentList->setNumPages(numResultPages);
 
   // make sure the header is expanded
   if (m_collapsibleComponentList->checkedCollapsibleComponent()) {
diff --git a/src/shared_gui_components/BuildingComponentDialogCentralWidget.hpp b/src/shared_gui_components/BuildingComponentDialogCentralWidget.hpp
index 10728ea57..b1e1cc2d5 100644
--- a/src/shared_gui_components/BuildingComponentDialogCentralWidget.hpp
+++ b/src/shared_gui_components/BuildingComponentDialogCentralWidget.hpp
@@ -16,7 +16,6 @@
 #include <openstudio/nano/nano_signal_slot.hpp>  // Signal-Slot replacement
 #include <openstudio/utilities/bcl/BCLComponent.hpp>
 #include <openstudio/utilities/bcl/BCLMeasure.hpp>
-#include <openstudio/utilities/bcl/BCL.hpp>
 
 #include "../shared_gui_components/ProgressBarWithError.hpp"
 
@@ -55,9 +54,6 @@ class BuildingComponentDialogCentralWidget
   void setTid();
   void componentDownloadComplete(const std::string& uid, const boost::optional<BCLComponent>& component);
   void measureDownloadComplete(const std::string& uid, const boost::optional<BCLMeasure>& measure);
-  std::vector<openstudio::BCLSearchResult> m_allResponses;
-
-  std::vector<openstudio::BCLSearchResult> fetchAndSortResponses(const std::string& filterType, int tid, const QString& searchString);
 
   int m_tid;
   CollapsibleComponentList* m_collapsibleComponentList;