Added search functionaity