Support to query strings

Add support to query strings