Hi,
just to make things more complicated - there is a 5th version of the order (both first and second type)- given to foreign dignitaries only.
It has both type of swords - war and merit (on the cross and above the cross). For the first type, I have a cavalier only, while for the second type, I have cavalier but I've seen it up to the Grand Officer. It seems that the ribbon is of the war type, with a silver/white stripe added to the middle (second type). This one was sold at auction without badge.