Added note type, draft, and multiple results