Correct element orders to comply with web-app_2_3.dtd