Bug fixes and refinement for category datasource
CategoryBreadcrumb datasource