Melissa Iori, 10/14/2014, fixed all queries on Labs 5 and 6