Also fix non-global hierarchical categories for edit form

Addendum to d4f21719d44622cf21ab954a11acc40fe01a1540