Fixed merge issues; Parameterized support mailing list; Testing email address lookup