For #42: Adjust context navigation for client notes