added string query support