dfxml-to-sql macro modified