Improved removement of not marked nodes; improved tree pruning
performance
Return correct result from query
Merge branch 'master'