Make map-data check function more robust
Ensure to not store empty category values