LPS-46764 UNFINISHED Manage Categories and Tags changes