3669 fix query

#3669