Updated categories - added individual categories check