update type switcher for notes
Merge branch 'ticket-357' into testing