Improve search functionality in ProductCatalog and use it in Stock Diary