Modidied plugin "Search"