Also added support for an entry id attribute in shortcode.