Synch up the SearchServices and fix some unit test failures