Make scheduled witnesses table work smoother