Fixed search errors CDS