Improve search into supplier command list