Patch to form.fill to make it play nice with phonenumber fields