Name and Type search now search for sub strings!