Add opening and closing {} symbols to route tokens.
Remove the need to use : within tokens / filters.
Fix optional token handling.