Updated multbQueryGenerator to work with simple column names and rework FROM clauses