[clean] removing Plugin::Search, useless
small fixes
[cleaning] adjusting before merge