Improvements in #4 xml sample (all but immunizations)