Fixed, . matches everything in url, need to escape
Some clean up