BugFix: Only add tags if dataWithCategory exists