Fixed #6504 by making table sortable
(cherry picked from commit 55f67b5abd9b809807e328477779d97120908273)
Fixed #6504 by making table sortable
(cherry picked from commit 55f67b5abd9b809807e328477779d97120908273)