Allow field to be used in shortcode in other cases

3.0-unstable version of #2339
Merge pull request #2371 from jamesgol/shortcodewithoutid-3

Allow field to be used in shortcode in other cases