kdb-bot/src/bot_core/service/client_utils_service.py

@@ -91,6 +91,11 @@ class ClientUtilsService(ClientUtilsServiceABC):
             if select is None:
                 select = lambda x: x
 
-            _l = _l.skip(_l.select(select).index_of(current))
+            sl = _l.select(select)
+            sl = sl.where(lambda x: current in x)
+            if current in sl:
+                sl = sl.skip(sl.index_of(current))
+
+            _l = _l.where(lambda x: x.name in sl)
 
         return _l.take(25)