small updates to multiple_tables and queries