Improve performance in the table. Re #719 and #732
Merge pull request #745 from rashidkpc/master

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