add query feature but doesn't work...