Adding support for string in query keys