Big simplification. Only leave sort and context filter