fixed perfomance issue on product screen