refactor and fix bug on ClientNoteList