#531366 by mikeker: Move token substitutions to prior to filtering in custom content type. This could have some effects on existing installs.