Adding support for string in query keys
Merge pull request #1121 from sashadt/o15demo

Adding support for string in query keys