Added more constraints to the email and url functions.