Add support for field of type email and tel.