#4403: More requested changes to pubs form.