Updated to react to map preferences