Searching, filtering fixes.