improving the query builder node windows design