Switch to using url-field directive