Added dynamic query for entity keys with row versions.