Test case for #1455
Fix #1455
Safer queryKeys()
Merge pull request #1456 from sjinks/issue-1455

Fix #1455