Several keys on Apple Magic Keyboard with Numeric Keypad not working after upgrade to OS 12.1

I've got an M1 Macbook Pro that I upgraded from 12.0 to 12.1 this morning. I've been using an Apple Magic Keyboard with Numeric Keypad as a bluetooth keyboard since day 1 with this laptop.

Since the software update the keyboard are no longer responsive:

• Caps Lock
• Tab
• Numeric keypad keys (F16 > Enter)

I've followed all the advice I can find, including ensuring mouse keys are turned off, slow keys etc.

In the keyboard input options the only keyboards available appear to look like the laptop keyboard layout...

I've tried resetting the PRAM after removing the keyboard, and then re-adding the keyboard, but the system appears to remember the previous settings of the keyboard anyway, such as the custom name I gave the keyboard - so it's not clear if removing it from bluetooth and re-adding actually resets the keyboard fully.

A couple of questions:

1. Should the "Input Sources" keyboard illustration (or the Keyboard Viewer) show a keyboard layout that matches the Keyboard with Numeric Keypad?
2. Is there a way to REALLY remove the keyboard from the bluetooth so adding it is as a new keyboard?
3. Is there a way to "reset" the Magic Keyboard with Numeric Keypad?

Thanks in advance.