CHANGE: Fefactoring Email entity, add search queries.