Partially fixed .content.xml
Updated .content.xml handling.