"add page" behaviour fixed to work with new FormField IDs (#786)