Flush out iterative query logic

Also remove merge order / behavior