working category and sort selection
Merge branch 'grouping_options' into development