Various changes to make the our cardml format work better with agilegridplanner