an upgrade fix and further pubIds porting

Have you tried this? We're using AjaxFormHandler for nearly everything now -- maybe better to adapt the form save code to use that rather than reverting to FormHandler. One of the benefits is that it'll no longer require a full page reload in most cases.