Changed RegEx to be faster and to pick the correct urls