NR-932 : NewsML General Wire Template

Small fixes