Fix optional map handling
Fix optional map handling

Change-Id: I81c080150f311f760ea725dfc53d2a873bc85033

wikimedia/mediawiki-extensions-Kartographer,wikimedia/mediawiki-extensions-Kartographer,wikimedia/mediawiki-extensions-Kartographer