Refactor Actions and Model for search function
Adding mail criteria to the search form