Name was missing from Link and Query.
Href on collection is optional.
Improved property handling