improve picture shortcode to work with img AND image id