Corrected the cat/subcat stuff.