Resolves JNAPC-279, again
Fixed notes issues with crud