BUG FIX: Search doesn't work - fixed