moved some planner logic to plannodebuilder

for QueryAndFetchNode (not in grouping queries) and QueryThenFetchNode