Fix in checkout template & product listing to close #1362