[#2092] Minor tweaks to new form request handlers and corresponding twig functions