[Fix] Correct the search behavior
[Add] SearchData should be working now