Fix query
bug fix