Fix #85: Enhancement and support for composite primary keys in grid data