fix clear overrides for categories
Merge branch 'master2'