CRAFTERCMS-324;CRAFTERCMS-298

Fixed bugs with pages ending with index.xml