Added support for short codes with content
Ticket #ED-5