Improved product details search based on latest refactoring