Remove useless insertNode call
Fix query timeouts
Add bucket count option