Handling of primary keys (as row ids) now works