Increased timeout and hopefully faster table modification to fix #1573

@Kartones CR this, please. I hope this is faster for big tables (+5M rows), and timeout is HUGE but maybe necessary...