added search/filter by name and location