Pattern-based routes match refactored