Added search; fixed some bugs with the 2.0 api