Fixed a nasty performance issue with needless re-parsing of note xml