If you're on Facebook Theo Gibb has posted a sequence of photos showing how to modify the Hohner action to stop the buttons disappearing down the holes. Or you could get him or another repairer to do it for you.

I can't create a link so look for his page and go to photos.