Bug fix to Map and OSOrder model