Refactor email sub

Email Subscription Modify and Retrieve

I also noticed that our Email Subscription model didn't have all the right values in there, so I fixed it.