Use raw vars due to circular structure
Update base URL regex