added $s to URL regexes