Revise queries to use the new tables...