better workaround for publishing error
Merge branch 'fix/keyerrorpublishpage' into custom/without-empty-all