Fixed grouping and sorting on home page