updated search method
Merge branch 'dde_upgrade'