various fixes on notes management