Fix filter running order
Fix filter running order
Merge branch 'hotfix/filter' of github.com:abdollahpour/xweb into hotfix/filter
Null item will remove from DataTools instruction automatically
Merge branch 'hotfix/filter'