Some hot-fixes on editting notes
Merge branch 'develop'