Prevent invalid products and remove duplication
Update templates