Correct splitting of map name and by key, aliases does not follow the convention
Supressess blank line output for keys with empty values
Authored by: lile 2017-10-18
Parent: [r188]
Child: [r190]