Filter search linq query - mvc

See more:

C#

LINQ

MVC

Dear all,

The current query below, will only filter result if both search and type filters are used together. How can I get the query to filter data by (name),or (type),or (type and name). Would I need to add predicate logic in the linq query. I am currently learning and programming as I go along, so please excuse my silly mistakes or illiterate logic.

public ActionResult Search(string search, string type)
 {

     var TypeList = new List<string>();

     var TypeQry = from d in db.data_qy
                    orderby d.Type
                    select d.Type;

     TypeList.AddRange(TypeQry.Distinct());

     ViewBag.type = new SelectList(TypeList);


     DateTime yesterday = DateTime.Today.AddBusinessDays(-1);

     var query = from s in db.data_qy
                where s.UploadDate == yesterday
                select (s);


     if (!String.IsNullOrEmpty(search))
     {
         query = query.Where(s => s.Name.Contains(search));
     }

     if (!String.IsNullOrEmpty(search))
     {
         query = query.Where(s => s.Type == type);
     }

     var data = query.ToList();

     return View(data);
 }

odel IEnumerable<System_Search_May2014.data_qy>
@{
    ViewBag.Title = "Search";
}

<h2>Search</h2>
<p>
    @Html.ActionLink("Create New", "Create")
    @using (Html.BeginForm("Search", "Home", FormMethod.Get))
    {
    <p>
        Type: @Html.DropDownList("type", "All")
        Name: @Html.TextBox("search",ViewBag.FilterValue as string)
        <input type="submit" value="Filter" />
    </p>
    }
</p>


<table style="width: auto; padding: 10px;">
    <tr style="background-color: lightgray; padding: 10px;">
        <th>Name
        </th>
        <th>Type
        </th>
        <th>Cover
        </th>
    </tr>
 
    @foreach (var item in Model)
    {
        <tr>
            <td>
                 @Html.DisplayFor(modelItem => item.Name)
            </td>
            <td>
                @Html.DisplayFor(modelItem => item.Type)
            </td>
              <td>
                @Html.DisplayFor(modelItem => item.Cover)
            </td>
           
        </tr>
    }
    </table>

Please advice, if possible.
Thank you in advance.