Issue #21376:use same metasql as display
Merge pull request #157 from garyhgohoos/21376

Issue #21376:use same metasql as display