Added search.
Fixed type setting.