Added support for empty & missing xml tags