Fixed category handling, now its working as per expectations