Fixed up duplicate issues with search