Dragonfly Brake Light Switch + Tyre Pump

[cahallett]

Hi,
What is the correct brake light switch for the Dragonfly?
I have a modern type currently fitted but it looks out of place and I would like to replace it.

Also, what tyre pump should be fitted under the fuel tank?
Mine is missing.

Thanks
Chris