fix regular expression to handle more urls..