Improved node block query in autocomplete