Fix for kind queries and their cursors