Move emails query to default args