Fix: Minor changed, and sorting of email result