Move to a simpler url regex

This should help alleviate a lot of recent issues.