Modified Search Component