move key filter to content
move grouping to content