Update in light of searching/filtering.