Adjustments to support remote form handling