I tried to use the newer file you mentioned to replace the old one, only that very file, and now it works!! I use https to show product page and canonical tag back on my header! So happy to learn this!!!

Thank you!!!!