Fix -S option to search description and name as documented