adding sort, filters, other cleanup
Merge branch 'develop' into staging