Mostly to be safe: if something like a wand is already on someone's person is it part of the 3 items? I headcanon Luna charms her wand to pass as a chopstick she wears in her hair among muggles.

And is filling in the blanks allowed for things not spilled in canon? I do have a filling in the blanks to explain some parts of book 7/movie 7.2 never revealed from her time in Malfoy Manor.