Added support for query by id when type is Edm.Int64