making progress on finishing filtering and searching