Commit 6/24  1

Category DataGrid Filter/Order work
Revert "Commit 6/24  1"

This reverts commit 1e00a7084d182964fe0e99d614bb2589ab83955d.
Commit 6/24 2

missed files