@maboueita
handle omitempty tag while expanding