CHANGE: Change Email entity, add search queries.