Fixed up search data to be more robust