Improvement of complex note structure handling