support key with query
Merge pull request #114 from cagegong/key_with_query

support key with query