fix tables, no time column yet