more metadata xml generation updates