Improve client filtering to work with archived notes.