Fixed issues
Fixed count calc on categories