Fix to stop system note being saved every time
Fix to stop system note being saved every time

IF condition was wrong.. reordered code to make it more manageable.

jgoode/EDDiscovery,mwerle/EDDiscovery,jeoffman/EDDiscovery,jgoode/EDDiscovery,jeoffman/EDDiscovery,vendolis/EDDiscovery,jthorpe4/EDDiscovery,vendolis/EDDiscovery,mwerle/EDDiscovery