Fix #307 Rework with a simpler solution

Use 'Email:Site' string as a key instead of the EmailSite custom class.