Fixes matching issues.
Tuple construction happened in reverse order and OR issue was caused by my own debugging and demo config.