added field substitution on request