Merge branch 'hotfix/3'

Close #3
[#19] Ensure entities are validated as entities, not collections

- When a route match is found for the identifier, then we have an
  entity, not a collection.
Merge branch 'hotfix/patch-collection-selection' into develop

Forward port #19