SSP-1374 Supports null maps, new maps and courses added
Also added the requested labelling for the Move Plan Dialog