fix broken form pages and full-page errors