Fix reply
Add query by node