A general hot fix in layout.cat and IndexController.php