Add a specific search mode ;
Improve output list ;