Removed +id tags in XML