Updates to Search and Chirping code.