set/(re)move a few cases of set_category and set_subcategory (cherry picked from commit c1823412)
Attach a file by drag & drop or click to upload
