Fixes on notes management

More accurtae management of points (if any) appearance on the models