Merge "Show group headers correctly"