Refactor url-matching in fetchers