Fix for comment/note not receiving proper label