Remove basePath from required fields
Use original resource url if base url not provided
Fix names of fields
Fix field name