As you have noticed, we could start an argument in an empty room on here!
I know the OP doesn't want to try and fix or make any changes, however this is incorrect advice for the record.
The downstairs also has 2 way switching. Yellow is being used in the COM terminal for the 2 way switching...