Finish up multbQueryGenerator to shiyong's req