Ensure page is valid XML

Change-Id: I05b2ab2cb4bc6c2959e2665a4bbf758f1065cd06