Think I found first problem. The old hallway switch has one L1 (both black and blue) and one L2 (both red) and com options. The yellow must have been in the comms and I assumed it was earth.
The new switch has only 2 L1 and 2 L2 options.
Where shall I put the yellow.