Added search, fixed issues