finish cloudsearch integration (testing still needed)