AETV - Make URLPatterns regex more specific