improved handling of user notes [need to move it centrally]