G004 Query planner (diff)

Created by: ane4ka