Better handling of tables that are initially empty