Fix category.xml and annoying null category bug