Added a better support for viewproduct