(Feat/searc) Seach bug fix.