enable macro encoding of from/to again
fix xml generation