Reduce needless table_list call