update search method and replace old national id method
update search method and replace old national id method