Temporary fix to support xml tags - slash removed