~ Improve title and notes mapping