Handling "blank" entity names in XDA format