Updated search, now able to search by name and activity type