Expand query retrievs too many data

[wog48]

Expand queries man not be generated correctly when contain a navigation e.g.:

...As(key)/navigation1?$expand=navigation2

The generated query to retrieve data for the expand (navigation2) does not contain the key restriction from the entity set (As)

[wog48]

The issue shall be fixed with 2.2.0