Save options in ViewModel
Fix map image highlighting synchronisation