Improve performance in the table. Re #719 and #732