NN-10534 | Fix PHP notices, fix issue with page cache enabled for fix it now feature.