separate out query and filter building
separate out query and filter building

theodi/blocktrain,TheODI-UD2D/blocktrain,theodi/blocktrain,TheODI-UD2D/sir_handel,theodi/blocktrain,TheODI-UD2D/sir_handel,TheODI-UD2D/blocktrain,TheODI-UD2D/sir_handel,TheODI-UD2D/blocktrain