refactored search view
Merge branch 'dde_upgrade'