Open311 tweaks to get  round-tripping working