Re-Added search calls