updated FPF to work with new request data holders, refs #389