Added everything for Denys sorting table and filter/search.
Merge remote-tracking branch 'origin/develop' into develop