Fix Map and ORSWOT to use centralised functions
OD-Flag now uses centralised function for serialisation