improve query feature in node