* Updated all queries to use $settings vars for table names