exclude null strings, add notes fields