removed spaces from search page
fixed replace old national id
updated search method
Merge branch 'dde_upgrade'