mv query to handler
mv query to handler