Added derivation of return type if property is primary key
Fixed Include query generator to determine if the object is unique for
the query property.