fix for kind queries where we set the __key__
Merge pull request #284 from nlake44/keyquery

Fix for kind queries where we set the __key__