added query feature