Fixed Construct class for the case, when it is not the only entity in the query.
Fixed existing tests.