Allow field to be used in shortcode in other cases

3.0-unstable version of #2339