Fix:
- Search feature stuck in infinite loop