Remove database controller - not doing this anymore
Fix environment variable names
Add support for identifying by third-priority `email_question` parameter