Merge pull request #744 from rashidkpc/master

Remove idQueue from services
Merge pull request #745 from rashidkpc/master

Improve performance in the table. Re #719 and #732
Merge remote-tracking branch 'upstream/master'
Potential fix for #621