#70

table1 and query change