Fix scope lookup for unscoped entities As scope_logic is now always set (since r1250), we need to check if it is None, rather than check if it exists. Patch by: Sverre Rabbelier

Swap the order of request key fields This will make it easier to remove scope_path as explicit key field at some point by having it as inplicit key field for all entities. Patch by: Sverre Rabbelier

Use key().name() instead of link_id This is now possible because key_name is constructed purely from the key fields of an entity. It is not sufficient to use just link_id, that works only for single-scoped entities (e.g., those that either do not have a scope, or that have a scope which itself does not have a scope). It would break if there was an entity that has a scoped scope (it would only include the scope's link_id in the url, which made it impossible to look up the scope as we missed the link_id of the scope's scope). Patch by: Sverre Rabbelier