Added branch, email, and incoming_search to cfg
Added ehlo response
Renamed variable
Removed test code
Changed upsdf and poi join statement