Improved product browser code wrapping