Adding email in query. see BT#6752