Fixup CategoryTree config, disable where necessary

Disable cite in a couple of places too

Change-Id: Ibdd8671a11440aeb6fc25f945732c512b614b86a