Convert a number of queries to use the new dataflow library

Convert a number of queries to use the new dataflow library #3041