Switched to a simpler url match regexp