completed addition of type filter to search form and change in model logic to accomodate