Bug fixes for user and email entities and queries
Changed toString