I got this Citigolf as a project and knew there were issues. I sorted most of it. Did the major cambelt service and I'm about to get the car driving but when I shift, I found the "lollipop" comes out of the "cage" it's meant to sit in.
I've changed all the bushings in the shifting assembly. Every single one hoping that would be what I'm missing. It started feeling better as I heard the click into 1st but then I couldn't get neutral. The "lollipop" popped out of the cage again. This is very weird. Everything is tightened correctly so it's not like it's loose.
The gearbox selects everything correctly:
Neutral:

1st:

2nd:

The "lollipop" assembly:




I found this at the bottom of the gear lever. Could this be my issue:


Can anyone please help me? Are my adjustments off? Do I need to play with the pinch bolt of where the "cage" attaches to the long shaft of the gear lever to try and fine tune linkage settings or do any of the pictures show something broken or wrong in your opinion?
Thanks.