Refactored item routes matcher