diff --git a/finance_dl/amazon.py b/finance_dl/amazon.py
index d6340dc..a68d76f 100644
--- a/finance_dl/amazon.py
+++ b/finance_dl/amazon.py
@@ -445,9 +445,7 @@ def retrieve_all_order_groups():
             order_select_index = 0
 
             while True:
-                (order_filter,), = self.wait_and_return(
-                    lambda: self.find_visible_elements(By.XPATH, '//select[@name="orderFilter"]')
-                )
+                order_filter, = self.wait_and_locate((By.CSS_SELECTOR, '#time-filter, #orderFilter'))
                 order_select = Select(order_filter)
                 num_options = len(order_select.options)
                 if order_select_index >= num_options: