Fixed issue with notes showing 'null'