Try to rescue missing note, fix sub-list