Refactored solution-modifiers-node and select-node to query-node