Fix self referring sub-categories
ERM28931
[4.1.x]
Change-Id: I3855048d239ce908ba0eb684fab06087cc2b7910