Remove empty fieldsets from stomp organization message. Email fields added. BAZYNGO-603.