Restructed location evaluation questions to minimize the creation of additional tables in Aggregate