Some minior cleanup of search features as per solutions video.