lint and small bugs, node.js tests
Add query