LPS-42439 SF - make tag/categories consistent