#61670 made categories to links