- category add fixes as proposed by `vurdalak`